From 5e2401fa99c6032e3f909e77b31c9cdaa79729fc Mon Sep 17 00:00:00 2001
From: Philipp von Weitershausen <philipp@weitershausen.de>
Date: Sun, 11 Jul 2010 15:59:56 +0200
Subject: [PATCH] Preference overhaul

* Get rid of "tap" nomenclature.
* Make load*Tabs preferences integers so we can configure multiple behaviours (e.g. load, lazy, progressive, ...)
* Rename hostWhitelist to just whitelist in anticipation of feature generalization.
* Drop some preferences from the pref window, including the ability to add new entries to the whitelist.
---
 content/browser.js            |   1 +
 content/preferences.js        |  90 ++++---------------
 content/preferences.xul       | 100 ++++++---------------
 defaults/preferences/prefs.js |  18 ++--
 modules/prototypes.js         | 160 +++++++++++++++++++++++-----------
 5 files changed, 166 insertions(+), 203 deletions(-)

diff --git a/content/browser.js b/content/browser.js
index cf3451c..dc0e4bd 100644
--- a/content/browser.js
+++ b/content/browser.js
@@ -3,6 +3,7 @@ Components.utils.import("resource://bartab/prototypes.js");
 // Initialize BarTab as soon as possible.
 window.addEventListener("DOMContentLoaded", function() {
     window.removeEventListener("DOMContentLoaded", arguments.callee, false);
+    BarTabUtils.migratePrefs();
     var tabbrowser = document.getElementById("content");
     (new BarTabHandler).init(tabbrowser);
 }, false);
diff --git a/content/preferences.js b/content/preferences.js
index 0da2864..631e8a7 100644
--- a/content/preferences.js
+++ b/content/preferences.js
@@ -3,14 +3,13 @@ Components.utils.import("resource://bartab/prototypes.js");
 var BarTabPreferences = {
 
   init: function() {
-    BarTabUtils.mPrefs.addObserver("extensions.bartap.hostWhitelist", this, false);
+    BarTabUtils.mPrefs.addObserver("extensions.bartab.whitelist", this, false);
     this.onTimeoutChange();
-    this.onLoadChange();
-    this.updateHostWhitelist();
+    this.updateWhitelist();
   },
 
   destroy: function() {
-    BarTabUtils.mPrefs.removeObserver("extensions.bartap.hostWhitelist", this);
+    BarTabUtils.mPrefs.removeObserver("extensions.bartab.whitelist", this);
   },
 
   QueryInterface: function(aIID) {
@@ -31,32 +30,25 @@ var BarTabPreferences = {
     timerWidgets.style.visibility = visibility;
   },
 
-  onLoadChange: function() {
-    var menuitem = document.getElementById('loadOnSelect').selectedItem;
-    var delayWidgets = document.getElementById('delayWidgets');
-    var visibility = (menuitem.value == "2") ? 'visible' : 'hidden';
-    delayWidgets.style.visibility = visibility;
-  },
-
-  // Add to and remove hosts from whitelist
+  // Add to and remove entries from whitelist
 
-  updateHostWhitelist: function() {
-    var list = document.getElementById("hostWhitelist");
+  updateWhitelist: function() {
+    var list = document.getElementById("whitelist");
     while (list.firstChild) {
       list.removeChild(list.firstChild);
     }
 
-    var whitelist = BarTabUtils.getHostWhitelist();
-    whitelist.forEach(function(host) {
+    var whitelist = BarTabUtils.getWhitelist();
+    whitelist.forEach(function(entry) {
         let row = document.createElement("listitem");
-        row.setAttribute("label", host);
+        row.setAttribute("label", entry);
         list.appendChild(row);
       });
   },
 
-  hostSelected: function() {
-    var removeButton = document.getElementById("hostWhitelistRemove");
-    var list = document.getElementById("hostWhitelist");
+  whiteListEntrySelected: function() {
+    var removeButton = document.getElementById("whitelistRemove");
+    var list = document.getElementById("whitelist");
     if (list.selectedItems.length) {
       removeButton.setAttribute("disabled", "false");
     } else {
@@ -64,70 +56,26 @@ var BarTabPreferences = {
     }
   },
 
-  removeHost: function() {
-    var list = document.getElementById("hostWhitelist");
-    var whitelist = BarTabUtils.getHostWhitelist();
+  removeWhitelistEntry: function() {
+    var list = document.getElementById("whitelist");
+    var whitelist = BarTabUtils.getWhitelist();
     var self = this;
     list.selectedItems.forEach(function (item) {
-        var host = item.getAttribute("label");
-        var index = whitelist.indexOf(host);
+        var entry = item.getAttribute("label");
+        var index = whitelist.indexOf(entry);
         if (index == -1) {
             return;
         }
         whitelist.splice(index, 1);
     });
-    BarTabUtils.setHostWhitelist(whitelist);
-  },
-
-  addHost: function() {
-    var textbox = document.getElementById("hostWhitelistNewHost");
-    var whitelist = BarTabUtils.getHostWhitelist();
-    var host = textbox.value.trim();
-
-    if (!host) {
-      return;
-    }
-
-    // Convert whole URLs to hostnames
-    if ((host.substr(0, 7) == "http://")
-        || (host.substr(0, 8) == "https://")) {
-      try {
-        host = BarTabUtils.makeURI(host).host;
-      } catch(ex) {
-        // Ignore
-      }
-    }
-
-    // Sort out duplicates.
-    if (whitelist.indexOf(host) != -1) {
-      textbox.value = "";
-      return;
-    }
-
-    // We don't allow semicolon in the host name
-    // TODO it couldn't hurt to do a proper check for illegal characters
-    if (host.indexOf(';') != -1) {
-      return;
-    }
-
-    whitelist.push(host);
-    BarTabUtils.setHostWhitelist(whitelist);
-    textbox.value = "";
-  },
-
-  onNewHostKeyPress: function(event) {
-    switch (event.keyCode) {
-    case event.DOM_VK_ENTER:
-    case event.DOM_VK_RETURN:
-      this.addHost();
-    }
+    BarTabUtils.setWhitelist(whitelist);
   },
 
   observe: function(aSubject, aTopic, aData) {
     if (aTopic != "nsPref:changed") {
       return;
     }
-    this.updateHostWhitelist();
+    this.updateWhitelist();
   }
 
 };
diff --git a/content/preferences.xul b/content/preferences.xul
index 676afe1..d974921 100644
--- a/content/preferences.xul
+++ b/content/preferences.xul
@@ -11,33 +11,27 @@
   <prefpane id="bartab-prefpane" label="&prefpane.title;">
 
     <preferences>
-      <preference id="extensions.bartap.tapRestoredTabs"
-                  name="extensions.bartap.tapRestoredTabs"
-                  type="bool" />
-      <preference id="extensions.bartap.tapBackgroundTabs"
-                  name="extensions.bartap.tapBackgroundTabs"
-                  type="bool" />
-      <preference id="extensions.bartap.tapAfterTimeout"
-                  name="extensions.bartap.tapAfterTimeout"
-                  type="bool" />
-      <preference id="extensions.bartap.timeoutValue"
-                  name="extensions.bartap.timeoutValue"
+      <preference id="extensions.bartab.loadRestoredTabs"
+                  name="extensions.bartab.loadRestoredTabs"
                   type="int" />
-      <preference id="extensions.bartap.timeoutUnit"
-                  name="extensions.bartap.timeoutUnit"
+      <preference id="extensions.bartab.loadBackgroundTabs"
+                  name="extensions.bartab.loadBackgroundTabs"
                   type="int" />
-      <preference id="extensions.bartap.findClosestUntappedTab"
-                  name="extensions.bartap.findClosestUntappedTab"
+      <preference id="extensions.bartab.unloadAfterTimeout"
+                  name="extensions.bartab.unloadAfterTimeout"
                   type="bool" />
-      <preference id="extensions.bartap.loadOnSelect"
-                  name="extensions.bartap.loadOnSelect"
+      <preference id="extensions.bartab.timeoutValue"
+                  name="extensions.bartab.timeoutValue"
                   type="int" />
-      <preference id="extensions.bartap.loadOnSelectDelay"
-                  name="extensions.bartap.loadOnSelectDelay"
+      <preference id="extensions.bartab.timeoutUnit"
+                  name="extensions.bartab.timeoutUnit"
                   type="int" />
+      <preference id="extensions.bartab.findClosestLoadedTab"
+                  name="extensions.bartab.findClosestLoadedTab"
+                  type="bool" />
     </preferences>
 
-    <groupbox id="barTapGroup">
+    <groupbox id="BarTabGroup">
       <caption label="&group.label;"/>
 
       <grid>
@@ -53,10 +47,10 @@
              accesskey="&restoredTabs.accesskey;"
              control="menuRestoredTabs" />
       <menulist id="menuRestoredTabs"
-                preference="extensions.bartap.tapRestoredTabs">
+                preference="extensions.bartab.loadRestoredTabs">
         <menupopup>
-          <menuitem label="&loadTabs.label;" value="false"/>
-          <menuitem label="&dontLoadTabs.label;" value="true"/>
+          <menuitem label="&loadTabs.label;" value="0"/>
+          <menuitem label="&dontLoadTabs.label;" value="1"/>
         </menupopup>
       </menulist>
     </row>
@@ -68,10 +62,10 @@
              accesskey="&backgroundTabs.accesskey;"
              control="menuBackgroundTabs" />
       <menulist id="menuBackgroundTabs"
-                preference="extensions.bartap.tapBackgroundTabs">
+                preference="extensions.bartab.loadBackgroundTabs">
         <menupopup>
-          <menuitem label="&loadTabs.label;" value="false"/>
-          <menuitem label="&dontLoadTabs.label;" value="true"/>
+          <menuitem label="&loadTabs.label;" value="0"/>
+          <menuitem label="&dontLoadTabs.label;" value="1"/>
         </menupopup>
       </menulist>
     </row>
@@ -83,7 +77,7 @@
              accesskey="&unloadAfterTimeout.accesskey;"
              control="tapAfterTimeout" />
       <menulist id="tapAfterTimeout"
-                preference="extensions.bartap.tapAfterTimeout"
+                preference="extensions.bartab.unloadAfterTimeout"
                 oncommand="BarTabPreferences.onTimeoutChange();">
         <menupopup>
           <menuitem label="&doNothing.label;" value="false"/>
@@ -94,10 +88,10 @@
         <textbox id="timeoutValue"
                  type="number"
                  size="2"
-                 preference="extensions.bartap.timeoutValue"
+                 preference="extensions.bartab.timeoutValue"
                  aria-labelledby="timeoutUnit"/>
         <menulist id="timeoutUnit"
-                preference="extensions.bartap.timeoutUnit">
+                preference="extensions.bartab.timeoutUnit">
           <menupopup>
             <menuitem label="&timeoutSecs.label;" value="1"/>
             <menuitem label="&timeoutMins.label;" value="60"/>
@@ -114,63 +108,27 @@
       <vbox>
         <label value="&hostWhitelist.label;"
                accesskey="&hostWhitelist.accesskey;"
-               control="hostWhitelist" />
+               control="whitelist" />
         <description style="font: small-caption;
                             font-weight: normal;
                             width: 0; /* trigger word wrapping */
                             margin: 0.5em 1em 0em 1em;">&hostWhitelist.description;</description>
       </vbox>
-      <listbox id="hostWhitelist"
+      <listbox id="whitelist"
                flex="1"
                style="height: 5em;"
                seltype="multiple"
-               onselect="BarTabPreferences.hostSelected(event);">
+               onselect="BarTabPreferences.whitelistEntrySelected(event);">
       </listbox>
       <vbox>
         <spacer flex="1" />
-        <button id="hostWhitelistRemove"
+        <button id="whitelistRemove"
                 disabled="true"
                 label="&hostWhitelistRemove.label;"
                 accesskey="&hostWhitelistRemove.accesskey;"
-                oncommand="BarTabPreferences.removeHost();" />
+                oncommand="BarTabPreferences.removeWhitelistEntry();" />
       </vbox>
     </row>
-    <row>
-      <spacer flex="1" />
-      <textbox id="hostWhitelistNewHost"
-               onkeypress="BarTabPreferences.onNewHostKeyPress(event);" />
-      <button id="hostWhitelistAdd"
-              label="&hostWhitelistAdd.label;"
-              accesskey="&hostWhitelistAdd.accesskey;"
-              oncommand="BarTabPreferences.addHost();" />      
-    </row>
-
-    <separator class="thin"/>
-
-    <row align="center">
-      <label value="&loadOnSelect.label;"
-             accesskey="&loadOnSelect.accesskey;"
-             control="loadOnSelect" />
-      <menulist id="loadOnSelect"
-                preference="extensions.bartap.loadOnSelect"
-                oncommand="BarTabPreferences.onLoadChange();">
-        <menupopup>
-          <menuitem label="&loadAfterAskingMe.label;" value="0"/>
-          <menuitem label="&loadImmediately.label;" value="1"/>
-          <menuitem label="&loadAfterDelay.label;" value="2"/>
-        </menupopup>
-      </menulist>
-      <hbox id="delayWidgets" align="center">
-        <textbox id="loadOnSelectDelay"
-                 type="number"
-                 size="4"
-                 preference="extensions.bartap.loadOnSelectDelay"
-                 aria-labelledby="delayMilliseconds"/>
-        <label id="delayMilliseconds"
-               value="&delayMilliseconds.label;"
-               control="loadOnSelectDelay" />
-      </hbox>
-    </row>
 
     <separator class="thin"/>
 
@@ -179,7 +137,7 @@
              accesskey="&closingTabs.accesskey;"
              control="menuClosingTabs" />
       <menulist id="menuClosingTabs"
-                preference="extensions.bartap.findClosestUntappedTab">
+                preference="extensions.bartab.findClosestLoadedTab">
         <menupopup>
           <menuitem label="&doNothing.label;" value="false"/>
           <menuitem label="&findClosestLoadedTab.label;" value="true"/>
diff --git a/defaults/preferences/prefs.js b/defaults/preferences/prefs.js
index ef40d5b..61571ba 100644
--- a/defaults/preferences/prefs.js
+++ b/defaults/preferences/prefs.js
@@ -1,12 +1,12 @@
-pref("extensions.bartap.tapRestoredTabs", true);
-pref("extensions.bartap.tapBackgroundTabs", false);
-pref("extensions.bartap.tapAfterTimeout", false);
-pref("extensions.bartap.timeoutValue", 2);
-pref("extensions.bartap.timeoutUnit", 3600);
-pref("extensions.bartap.hostWhitelist", "");
-pref("extensions.bartap.findClosestUntappedTab", true);
-pref("extensions.bartap.loadOnSelect", 1);
-pref("extensions.bartap.loadOnSelectDelay", 500);
+pref("extensions.bartab.loadRestoredTabs", 1);
+pref("extensions.bartab.loadBackgroundTabs", 0);
+pref("extensions.bartab.unloadAfterTimeout", false);
+pref("extensions.bartab.timeoutValue", 2);
+pref("extensions.bartab.timeoutUnit", 3600);
+pref("extensions.bartab.whitelist", "");
+pref("extensions.bartab.findClosestLoadedTab", true);
+pref("extensions.bartab.loadOnSelectDelay", 0);
+pref("extensions.bartab.migrated", false);
 
 // https://developer.mozilla.org/en/Localizing_extension_descriptions
 pref("extensions.bartap@philikon.de.description", "chrome://bartab/locale/overlay.properties");
diff --git a/modules/prototypes.js b/modules/prototypes.js
index 090f00e..57cbd93 100644
--- a/modules/prototypes.js
+++ b/modules/prototypes.js
@@ -107,7 +107,7 @@ BarTabHandler.prototype = {
      */
     onTabOpen: function(aEvent) {
         var tab = aEvent.originalTarget;
-        if (tab.selected || !BarTabUtils.getBoolPref("tapBackgroundTabs")) {
+        if (tab.selected || !BarTabUtils.getPref("loadBackgroundTabs")) {
             return;
         }
         tab.setAttribute("ontap", "true");
@@ -121,7 +121,7 @@ BarTabHandler.prototype = {
      * restored tabs from loading.
      */
     onTabRestoring: function(aEvent) {
-        if (!BarTabUtils.getBoolPref("tapRestoredTabs")) {
+        if (!BarTabUtils.getPref("loadRestoredTabs")) {
             return;
         }
         let tab = aEvent.originalTarget;
@@ -145,39 +145,25 @@ BarTabHandler.prototype = {
             return;
         }
 
-        let self = this;
-
-        switch (BarTabUtils.getIntPref("loadOnSelect")) {
-        case 1:
+        let delay = BarTabUtils.getPref("loadOnSelectDelay");
+        if (!delay) {
             // Load immediately
             this.loadTab(tab);
             return;
-        case 2:
-            // Load after delay
-            let delay = BarTabUtils.getIntPref("loadOnSelectDelay");
-            let window = tab.ownerDocument.defaultView;
-            window.setTimeout(function() {
-                if (tab.selected) {
-                    self.loadTab(tab);
-                }
-            }, delay);
-            return;
-        case 0:
-            // Ask whether to load
-            let box = this.tabbrowser.getNotificationBox(tab.linkedBrowser);
-            let label = this.l10n.getString("loadNotification");
-            let buttons = [{
-                label: this.l10n.getString("loadButton"),
-                accessKey: this.l10n.getString("loadButton.accesskey"),
-                callback: function() {self.loadTab(tab);}}];
-            box.appendNotification(label, 'bartab-load', "",
-                                   box.PRIORITY_INFO_MEDIUM, buttons);
-            return;
         }
+
+        // Load after delay
+        let window = tab.ownerDocument.defaultView;
+        let self = this;
+        window.setTimeout(function() {
+            if (tab.selected) {
+                self.loadTab(tab);
+            }
+        }, delay);
     },
 
     onTabClose: function(aEvent) {
-        if (!BarTabUtils.getBoolPref("findClosestUntappedTab")) {
+        if (!BarTabUtils.getPref("findClosestLoadedTab")) {
             return;
         }
         let tab = aEvent.originalTarget;
@@ -265,10 +251,10 @@ BarTabHandler.prototype = {
         var state = sessionstore.getTabState(aTab);
         var newtab = tabbrowser.addTab();
 
-        // The user might not have the 'extensions.bartap.tapRestoredTabs'
-        // preference enabled but still wants to unload this tab.  That's
-        // why we need to make sure we hook into the new tab before
-        // restoring the tab state.
+        // The user might not have 'extensions.bartab.loadRestoredTabs'
+        // set to 1 but still wants to unload this tab.  That's why we
+        // need to make sure we hook into the new tab before restoring
+        // the tab state.
         if (newtab.getAttribute("ontap") != "true") {
             newtab.setAttribute("ontap", "true");
             (new BarTabWebNavigation()).hook(newtab);
@@ -316,7 +302,7 @@ BarTabHandler.prototype = {
         });
     },
 
-    toggleHostWhitelist: function(aTab) {
+    toggleWhitelist: function(aTab) {
         var uri = aTab.linkedBrowser.currentURI;
         try {
             var host = uri.host;
@@ -325,7 +311,7 @@ BarTabHandler.prototype = {
             return;
         }
 
-        let whitelist = BarTabUtils.getHostWhitelist();
+        let whitelist = BarTabUtils.getWhitelist();
         let index = whitelist.indexOf(host);
         if (index == -1) {
             whitelist.push(host);
@@ -333,7 +319,7 @@ BarTabHandler.prototype = {
             whitelist.splice(index, 1);
         }
 
-        BarTabUtils.setHostWhitelist(whitelist);
+        BarTabUtils.setWhitelist(whitelist);
     },
 
     /*
@@ -739,7 +725,7 @@ BarTabTimer.prototype = {
     onTabOpen: function(aEvent) {
         var tab = aEvent.originalTarget;
         if (tab.selected
-            || BarTabUtils.getBoolPref("tapBackgroundTabs")) {
+            || (BarTabUtils.getPref("loadBackgroundTabs") == 1)) {
             return;
         }
         this.startTimer(tab);
@@ -768,7 +754,7 @@ BarTabTimer.prototype = {
     },
 
     startTimer: function(aTab) {
-        if (!BarTabUtils.getBoolPref("tapAfterTimeout")) {
+        if (!BarTabUtils.getPref("unloadAfterTimeout")) {
             return;
         }
         if (aTab.getAttribute("ontap") == "true") {
@@ -778,8 +764,8 @@ BarTabTimer.prototype = {
         if (aTab._barTabTimer) {
             this.clearTimer(aTab);
         }
-        let secs = BarTabUtils.getIntPref("timeoutValue")
-                 * BarTabUtils.getIntPref("timeoutUnit");
+        let secs = BarTabUtils.getPref("timeoutValue")
+                 * BarTabUtils.getPref("timeoutUnit");
         let window = aTab.ownerDocument.defaultView;
         // Allow 'this' to leak into the inline function
         let self = this;
@@ -916,12 +902,79 @@ var BarTabUtils = {
         return result.root.getChild(0);
     },
 
-    getBoolPref: function(aPref) {
-         return BarTabUtils.mPrefs.getBoolPref("extensions.bartap." + aPref);
+    getPref: function(aPref, aDefaultValue) {
+        let branch = BarTabUtils.mPrefBranch;
+        switch (branch.getPrefType(aPref)) {
+        case Ci.nsIPrefBranch.PREF_STRING:
+            return branch.getComplexValue(aPref, Ci.nsISupportsString).data;
+        case Ci.nsIPrefBranch.PREF_INT:
+            return branch.getIntPref(aPref);
+        case Ci.nsIPrefBranch.PREF_BOOL:
+            return branch.getBoolPref(aPref);
+        case Ci.nsIPrefBranch.PREF_INVALID:
+            return aDefaultValue;
+        default:
+            // This should never happen.
+            throw "Error getting pref " + aPref + "!\n";
+        }
     },
 
-    getIntPref: function(aPref) {
-         return BarTabUtils.mPrefs.getIntPref("extensions.bartap." + aPref);
+    migratePrefs: function() {
+        if (this.getPref("migrated")) {
+            return;
+        }
+
+        // Grab the list of old pref names
+        let newBranch = BarTabUtils.mPrefBranch;
+        let oldBranch = BarTabUtils.mPrefs.getBranch("extensions.bartap.");
+        let oldPrefNames = oldBranch.getChildList("", {});
+        let value;
+
+        for each (let pref in oldPrefNames) {
+            switch (pref) {
+            case "tapRestoredTabs":
+                value = oldBranch.getBoolPref(pref);
+                newBranch.setIntPref("loadRestoredTabs", 0+value);
+                break;
+
+            case "tapBackgroundTabs":
+                value = oldBranch.getBoolPref(pref);
+                newBranch.setIntPref("loadBackgroundTabs", 0+value);
+                break;
+
+            case "tapAfterTimeout":
+                value = oldBranch.getBoolPref(pref);
+                newBranch.setBoolPref("unloadAfterTimeout", value);
+                break;
+
+            case "loadOnSelect":
+                value = oldBranch.getBoolPref(pref);
+                if (value) {
+                    value = oldBranch.getBoolPref("loadOnSelectDelay");
+                }
+                newBranch.setIntPref("loadOnSelectDelay", 0+value);
+                break;
+
+            case "loadOnSelectDelay":
+                break;
+
+            case "findClosestUntappedTab":
+                value = oldBranch.getBoolPref(pref);
+                newBranch.setBoolPref("findClosestLoadedTab", value);
+                break;
+
+            case "hostWhitelist":
+                value = oldBranch.getCharPref(pref);
+                newBranch.setCharPref("whitelist", value);
+                break;
+
+            default:
+                value = oldBranch.getIntPref(pref);
+                newBranch.setIntPref(pref, value);
+            }
+        }
+        oldBranch.deleteBranch("");
+        newBranch.setBoolPref("migrated", true);
     },
 
     /*
@@ -929,7 +982,7 @@ var BarTabUtils = {
      */
     whiteListed: function(aURI) {
         try {
-            return (BarTabUtils.getHostWhitelist().indexOf(aURI.host) != -1);
+            return (BarTabUtils.getWhitelist().indexOf(aURI.host) != -1);
         } catch(ex) {
             // Most likely gotouri.host failed, so it isn't on the white list.
             return false;
@@ -938,23 +991,22 @@ var BarTabUtils = {
 
     /*
      * It might seem more elegant to use a getter & setter here so you
-     * could just use this.hostWhiteList or similar.  However, that
-     * would suggest this.hostWhiteList would always return the same
-     * array and that mutations to it would be persisted.  Both are
-     * not the case.
+     * could just use this.whiteList or similar.  However, that would
+     * suggest this.whiteList would always return the same array and
+     * that mutations to it would be persisted.  Both are not the case.
      */
 
-    getHostWhitelist: function() {
+    getWhitelist: function() {
         var whitelist = BarTabUtils.mPrefs.getCharPref(
-            "extensions.bartap.hostWhitelist");
+            "extensions.bartab.whitelist");
         if (!whitelist) {
             return [];
         }
         return whitelist.split(";");
     },
 
-    setHostWhitelist: function(whitelist) {
-        BarTabUtils.mPrefs.setCharPref("extensions.bartap.hostWhitelist",
+    setWhitelist: function(whitelist) {
+        BarTabUtils.mPrefs.setCharPref("extensions.bartab.whitelist",
                                        whitelist.join(";"));
     }
 
@@ -969,6 +1021,10 @@ XPCOMUtils.defineLazyGetter(BarTabUtils, "mPrefs", function () {
          .getService(Ci.nsIPrefService)
          .QueryInterface(Ci.nsIPrefBranch2);
 });
+XPCOMUtils.defineLazyGetter(BarTabUtils, "mPrefBranch", function () {
+  return BarTabUtils.mPrefs.getBranch("extensions.bartab.")
+         .QueryInterface(Ci.nsIPrefBranch2);
+});
 XPCOMUtils.defineLazyServiceGetter(BarTabUtils, "mIO",
                                    "@mozilla.org/network/io-service;1",
                                    "nsIIOService");