label: Ignore __ for mnemonics

We were not ignoring double underscores for mnemonics
in one place, as we should.

Fixes: #4129

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index ced834f98084ee487a539593162c185d4254b4c1..d4e414d8822e654078edcb9237b8abdca61724f7 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -3187,7 +3187,7 @@ strip_ulines (const char *text,
         }
 
       *q = *p;
-      if (after_uline && *accel_key == 0)
+      if (after_uline && *p != '_' && *accel_key == 0)
         *accel_key = g_utf8_get_char (p);
 
       q++;