Also strip (_F) without a space

diff --git a/ChangeLog b/ChangeLog
index 7523f9a64a5590d7f4433031bcbaf731ab3ea5ff..9eb2694204e9bb6e4e21a5d4c49597c0cfc6b9e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@
        * README.in: Mention the stripping of (_F) suffixes.
 
        * gtk/gtktoolbar.c (_gtk_toolbar_elide_underscores): Strip a suffix of 
-       the form " (_<single character>)", since this is the preferred way
+       the form "(_<single character>)", since this is the preferred way
        for some languages to indicate accelerators.  (#323956, Yang Hong)
 
        * gtk/gtklabel.c (gtk_label_class_init): Add a gtk-label-select-on-focus

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7523f9a64a5590d7f4433031bcbaf731ab3ea5ff..9eb2694204e9bb6e4e21a5d4c49597c0cfc6b9e4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -3,7 +3,7 @@
        * README.in: Mention the stripping of (_F) suffixes.
 
        * gtk/gtktoolbar.c (_gtk_toolbar_elide_underscores): Strip a suffix of 
-       the form " (_<single character>)", since this is the preferred way
+       the form "(_<single character>)", since this is the preferred way
        for some languages to indicate accelerators.  (#323956, Yang Hong)
 
        * gtk/gtklabel.c (gtk_label_class_init): Add a gtk-label-select-on-focus

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 712b0e3c9ecfe2c4b68fac5898d3a34396ca5b40..29196215ee1a2f67ca1d580573c02d032178ce6e 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -4900,11 +4900,10 @@ _gtk_toolbar_elide_underscores (const gchar *original)
 
   if (s > 4)
     {
-      if (original[s - 5] == ' ' && 
-         original[s - 4] == '(' && 
+      if (original[s - 4] == '(' && 
          original[s - 3] == '_' && 
          original[s - 1] == ')')
-       q[-4] = '\0';
+       q[-3] = '\0';
     }