#53096

r=akkana, a=brendan
Can't override accelerators properly which we will be doing on OS/2

layout/xul/base/src/nsMenuFrame.cpp

@@ -1411,7 +1411,7 @@ nsMenuFrame::BuildAcceleratorText(nsString& aAccelString)
     NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv);
     if (NS_SUCCEEDED(rv) && prefs)
     {
-      rv = prefs->GetIntPref("ui.key.acceleratorKey", &accelKey);
+      rv = prefs->GetIntPref("ui.key.accelKey", &accelKey);
     }
 #ifdef DEBUG_akkana
     else

modules/libpref/src/init/all.js

@@ -437,7 +437,7 @@ pref("security.xpconnect.plugin.unrestricted", true);
 
 // Modifier key prefs: default to Windows settings,
 // menu access key = alt, accelerator key = control.
-pref("ui.key.acceleratorKey", 17);
+pref("ui.key.accelKey", 17);
 pref("ui.key.menuAccessKey", 18);
 pref("ui.key.menuAccessKeyFocuses", false);
 

modules/libpref/src/mac/macprefs.js

@@ -140,7 +140,7 @@ pref("font.name.fantasy.zh-TW", "XXX.fantasy");
 
 // Override the Windows settings: no menu key, meta accelerator key.
 pref("ui.key.menuAccessKey", 0);
-pref("ui.key.acceleratorKey", 224);
+pref("ui.key.accelKey", 224);
 
 // This overrides the setting in config.js (which points to the Windows page)
 config("menu.help.item_0.label","Help Contents");

rdf/content/src/nsXULKeyListener.cpp

@@ -497,7 +497,7 @@ nsXULKeyListenerImpl::Init(
   NS_WITH_SERVICE(nsIPref, prefs, NS_PREF_CONTRACTID, &rv);
   if (NS_SUCCEEDED(rv) && prefs)
   {
-    rv = prefs->GetIntPref("ui.key.acceleratorKey",
+    rv = prefs->GetIntPref("ui.key.accelKey",
                            (PRInt32*)&mXULKeyModifier);
   }
 #ifdef DEBUG_akkana