From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 2 Aug 2021 02:14:12 +0000 (-0400)
Subject: label: Ignore __ for mnemonics
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~1^2~44^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c51f2fc0ecd967bffe8fe754de7e7bcc231f08fa;p=gtk4.git

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 ced834f980..d4e414d882 100644
--- 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++;