Bug 293826 whitelist for software install remains empty until visiting a site triggers the notification bar

patch by moz_bugzilla@exchangecode.com r=mconnor a=asa

browser/components/preferences/permissions.js

@@ -190,6 +190,12 @@ var gPermissionManager = {
                        .getService(Components.interfaces.nsIObserverService);
     os.addObserver(this, "perm-changed", false);
 
+    if (this._type == "install") {
+      var enumerator = this._pm.enumerator;
+      if (!enumerator.hasMoreElements())
+        this._updatePermissions();
+    }
+
     this._loadPermissions();
     
     urlField.focus();
@@ -332,6 +338,40 @@ var gPermissionManager = {
     }  
   },
   
+  _updatePermissions: function ()
+  {
+    try {
+      var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+                                .getService(Components.interfaces.nsIIOService);
+      var pbi = Components.classes["@mozilla.org/preferences-service;1"]
+                          .getService(Components.interfaces.nsIPrefBranch2);
+      var prefList = [["xpinstall.whitelist.add", nsIPermissionManager.ALLOW_ACTION],
+                      ["xpinstall.whitelist.add.103", nsIPermissionManager.ALLOW_ACTION],
+                      ["xpinstall.blacklist.add", nsIPermissionManager.DENY_ACTION]];
+
+      for (var i = 0; i < prefList.length; ++i) {
+        try {
+          // this pref is a comma-delimited list of hosts
+          var hosts = pbi.getCharPref(prefList[i][0]);
+        } catch(ex) {
+          continue;
+        }
+
+        hostList = hosts.split(",");
+        var capability = prefList[i][1];
+        for (var j = 0; j < hostList.length; ++j) {
+          // trim leading and trailing spaces
+          var host = hostList[j].replace(/^\s*/,"").replace(/\s*$/,"");
+          try {
+            var uri = ioService.newURI("http://" + host, null, null);
+            this._pm.add(uri, this._type, capability);
+          } catch(ex) { }
+        }
+        pbi.setCharPref(prefList[i][0], "");
+      }
+    } catch(ex) { }
+  },
+  
   setHost: function (aHost)
   {
     document.getElementById("url").value = aHost;