Merge lp:~mconley/globalmenu-extension/bug710149-escape-underscores into lp:globalmenu-extension

[Mike Conley]

Here's a patch for bug 710149 (underscores are not being escaped properly). Any/all feedback welcome.

[Chris Coulson (chrisccoulson)]

Thanks!

Feel free to push this to lp:globalmenu-extension, with 1 minor adjustment though - could you please use PRBool rather than bool for foundAccessKey?

Thanks

review: Approve

=== modified file 'extensions/globalmenu/components/src/uGlobalMenuObject.cpp'
--- extensions/globalmenu/components/src/uGlobalMenuObject.cpp	2011-02-03 00:44:41 +0000
+++ extensions/globalmenu/components/src/uGlobalMenuObject.cpp	2011-02-04 19:26:11 +0000
@@ -478,6 +478,7 @@
   // Gecko stores the label and access key in separate attributes
   // so we need to convert label="Foo"/accesskey="F" in to
   // label="_Foo" for dbusmenu
+
   nsAutoString label;
   mContent->GetAttr(kNameSpaceID_None, uWidgetAtoms::label, label);
 
@@ -489,24 +490,34 @@
   PRUnichar *end = label.EndWriting();
   int length = label.Length();
   int pos = 0;
+  bool foundAccessKey = false;
 
   while(cur < end) {
-    if(*cur != *key) {
-      cur++;
-      pos++;
-    } else {
+    if((*cur == *key && !foundAccessKey) || *cur == PRUnichar('_')) {
+      
       length += 1;
       label.SetLength(length);
       int newLength = label.Length();
       if(length != newLength)
-        break;
+        break; 
+     
       cur = label.BeginWriting() + pos;
+      end = label.EndWriting();
       memmove(cur + 1, cur, (length - 1 - pos) * sizeof(PRUnichar));
 //                     \^/
       *cur = PRUnichar('_'); // Yeah!
 //                      v
-      break;
-    }
+
+      if(*cur == *key)
+        foundAccessKey = true;
+
+      cur += 2;
+      pos += 2; 
+
+    } else {
+      cur++;
+      pos++;
+    } 
   }
 
   // Ellipsize long labels. I've picked an arbitrary length here