Bug 306686 Make / start FAYT even when it's Shift+7 also make menus and xbl agree on the legal modifier token delimiters p=dainis_jonitis@swh-t.lv r=bz sr=me

content/xbl/builtin/browser-base.inc

@@ -29,5 +29,5 @@
       <handler event="keypress" key="z" command="cmd_redo" modifiers="accel,shift" />
       <handler event="keypress" key="a" command="cmd_selectAll" modifiers="accel"/>
 
-      <handler event="keypress" key="/" command="cmd_findTypeText"/>
-      <handler event="keypress" key="'" command="cmd_findTypeLinks"/>
+      <handler event="keypress" key="/" command="cmd_findTypeText" modifiers="shift any"/>
+      <handler event="keypress" key="'" command="cmd_findTypeLinks" modifiers="shift any"/>

layout/xul/base/src/nsMenuFrame.cpp

@@ -1514,7 +1514,7 @@ nsMenuFrame::BuildAcceleratorText()
   
   char* str = ToNewCString(modifiers);
   char* newStr;
-  char* token = nsCRT::strtok(str, ", ", &newStr);
+  char* token = nsCRT::strtok(str, ", \t", &newStr);
   while (token) {
       
     if (PL_strcmp(token, "shift") == 0)
@@ -1545,7 +1545,7 @@ nsMenuFrame::BuildAcceleratorText()
     
     accelText += *gModifierSeparator;
 
-    token = nsCRT::strtok(newStr, ", ", &newStr);
+    token = nsCRT::strtok(newStr, ", \t", &newStr);
   }
 
   nsMemory::Free(str);

widget/src/mac/nsMenuX.cpp

@@ -890,7 +890,7 @@ void nsMenuX::LoadMenuItem( nsIMenu* inParentMenu, nsIContent* inMenuItemContent
       keyContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::modifiers, modifiersStr);
 		  char* str = ToNewCString(modifiersStr);
 		  char* newStr;
-		  char* token = nsCRT::strtok( str, ", ", &newStr );
+		  char* token = nsCRT::strtok( str, ", \t", &newStr );
 		  while( token != NULL ) {
 		    if (PL_strcmp(token, "shift") == 0)
 		      modifiers |= knsMenuItemShiftModifier;
@@ -903,7 +903,7 @@ void nsMenuX::LoadMenuItem( nsIMenu* inParentMenu, nsIContent* inMenuItemContent
           modifiers |= knsMenuItemCommandModifier;
 		    }
 		    
-		    token = nsCRT::strtok( newStr, ", ", &newStr );
+		    token = nsCRT::strtok( newStr, ", \t", &newStr );
 		  }
 		  nsMemory::Free(str);