Fixed: Accel is always mapped to Control, no matter what the actual browser setting is

lib/keySelector.js

 /*
  * This file is part of the Adblock Plus build tools,
  * Copyright (C) 2006-2013 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 Cu.import("resource://gre/modules/Services.jsm");
 
 let validModifiers =
 {
-  ACCEL: "control",
+  ACCEL: null,
   CTRL: "control",
   CONTROL: "control",
   SHIFT: "shift",
   ALT: "alt",
   META: "meta",
   __proto__: null
 };
 
 /**
  * Sets the correct value of validModifiers.ACCEL.
  */
 function initAccelKey()
 {
+  validModifiers.ACCEL = "control";
   try
   {
     let accelKey = Services.prefs.getIntPref("ui.key.accelKey");
     if (accelKey == Ci.nsIDOMKeyEvent.DOM_VK_CONTROL)
       validModifiers.ACCEL = "control";
     else if (accelKey == Ci.nsIDOMKeyEvent.DOM_VK_ALT)
       validModifiers.ACCEL = "alt";
     else if (accelKey == Ci.nsIDOMKeyEvent.DOM_VK_META)
       validModifiers.ACCEL = "meta";
   }
   catch(e)
   {
-    validModifiers.ACCEL = "control";
     Cu.reportError(e);
   }
 }
 
 exports.KeySelector = KeySelector;
 
 /**
  * This class provides capabilities to find and use available keyboard shortcut
  * keys.
  * @param {ChromeWindow} window   the window where to look up existing shortcut
@@ skipping 160 matching lines @@
     return false;
   if (key.meta != event.metaKey || key.control != event.ctrlKey)
     return false;
 
   if (key.char && event.charCode && String.fromCharCode(event.charCode).toUpperCase() == key.char)
     return true;
   if (key.code && event.keyCode && event.keyCode == key.code)
     return true;
   return false;
 };