Merge lp:~chrisccoulson/ubufox/ff-4.0 into lp:~asac/ubufox/main

[Chris Coulson]

[lp:~chrisccoulson/ubufox/ff-4.0]

217. By Chris Coulson on 2010-11-09

* Look in the new location for the restart-required trigger, it has moved to a location not monitored by update-notifier now, so we only get the restart required notification in the browser

218. By Chris Coulson on 2010-11-09

* Merge the plugin finder code from Firefox 4. This now uses AddonManager, so the
  MinVersion needs to be bumped
* Drop the FF2.0 specific code

219. By Chris Coulson on 2010-11-09

* Drop the AddonsOverlay and associated code, this hasn't worked for several releases
  since we started using software-center, and nobody really noticed so far. We can reimplement this at a later date if wanted, but
  it throws JS exceptions when loading in FF4.0 now

220. By Chris Coulson on 2010-11-09

* Add sources.list for 10.10 and 11.04
* Ensure the wizard jumps to the last page when no plugins are found, by not checking the undefined mPluginInfoAptArrayLength
* Fix a missing-brace error

221. By Chris Coulson on 2010-11-10

* Make createPluginSetGroupBox work properly
* Fix a typo
* Fix use of the aptPlugins array

222. By Chris Coulson on 2010-11-10

* Ensure that licenseAccepted is always defind, so we don't fail to install a plugin that has no licenseURL

223. By Chris Coulson on 2010-11-10

* Specify for the extension to be unpacked by the installer. Without this, the prefs aren't used

224. By Chris Coulson on 2010-11-10

* Get the distributionID field for the pfs URL from the preferences, rather than hard-coding a value

Unmerged revisions

224. By Chris Coulson on 2010-11-10

* Get the distributionID field for the pfs URL from the preferences, rather than hard-coding a value

223. By Chris Coulson on 2010-11-10

* Specify for the extension to be unpacked by the installer. Without this, the prefs aren't used

222. By Chris Coulson on 2010-11-10

* Ensure that licenseAccepted is always defind, so we don't fail to install a plugin that has no licenseURL

221. By Chris Coulson on 2010-11-10

* Make createPluginSetGroupBox work properly
* Fix a typo
* Fix use of the aptPlugins array

220. By Chris Coulson on 2010-11-09

* Add sources.list for 10.10 and 11.04
* Ensure the wizard jumps to the last page when no plugins are found, by not checking the undefined mPluginInfoAptArrayLength
* Fix a missing-brace error

219. By Chris Coulson on 2010-11-09

* Drop the AddonsOverlay and associated code, this hasn't worked for several releases
  since we started using software-center, and nobody really noticed so far. We can reimplement this at a later date if wanted, but
  it throws JS exceptions when loading in FF4.0 now

218. By Chris Coulson on 2010-11-09

* Merge the plugin finder code from Firefox 4. This now uses AddonManager, so the
  MinVersion needs to be bumped
* Drop the FF2.0 specific code

217. By Chris Coulson on 2010-11-09

* Look in the new location for the restart-required trigger, it has moved to a location not monitored by update-notifier now, so we only get the restart required notification in the browser

216. By Chris Coulson on 2010-11-08

* In the restart notifier, don't hardcode a list of filenames for different browser versions, but just use MOZ_APP_LAUNCHER instead. This will indirectly fix LP: #511250 and should prevent it from happening again
  - update content/updateRestart.js

215. By Chris Coulson on 2010-11-08

* First cut at adding Firefox 4.0 support:
  - Rename AboutHome to AboutStartup, and have it handle about:startup now (to not conflict with the new about:home handler in Firefox
  - Set default home page to about:startpage
  - Add support for the XPCOM changes in Gecko 2.0

=== modified file 'chrome.manifest'
--- chrome.manifest	2009-03-18 19:16:05 +0000
+++ chrome.manifest	2010-11-10 15:13:41 +0000
@@ -28,8 +28,9 @@
 skin	ubufox	classic/1.0	skin/
 overlay	chrome://browser/content/browser.xul	chrome://ubufox/content/ubuntuHelpMenuOverlay.xul
 overlay	chrome://browser/content/browser.xul	chrome://ubufox/content/updateRestart.xul
-overlay chrome://mozapps/content/extensions/extensions.xul chrome://ubufox/content/ubuntuAddonsOverlay.xul appversion>=3.0b3
-overlay chrome://mozapps/content/extensions/extensions.xul chrome://ubufox/content/ubuntuAddonsOverlay.ffox2.xul appversion<2.0.0.*
-overlay chrome://browser/content/browser.xul chrome://ubufox/content/ubuntuAltpluginsOverlay.xul
+overlay chrome://browser/content/browser.xul	chrome://ubufox/content/ubuntuAltpluginsOverlay.xul
 
 override chrome://mozapps/content/plugins/pluginInstallerWizard.xul chrome://ubufox/content/pluginInstallerWizard.xul
+
+component {7a2a7a56-827f-4b38-bdac-31aa7ec2971d} components/aboutStartpage.js
+contract @mozilla.org/network/protocol/about;1?what=startpage {7a2a7a56-827f-4b38-bdac-31aa7ec2971d}

=== renamed file 'components/aboutHome.js' => 'components/aboutStartpage.js'
--- components/aboutHome.js	2010-07-17 19:05:27 +0000
+++ components/aboutStartpage.js	2010-11-10 15:13:41 +0000
@@ -99,10 +99,10 @@
   return defaultEngine.name;
 }
 
-function AboutHome() {}
-AboutHome.prototype = {
-  classDescription: "About Home",
-  contractID: "@mozilla.org/network/protocol/about;1?what=home",
+function AboutStartpage() {}
+AboutStartpage.prototype = {
+  classDescription: "About Startpage",
+  contractID: "@mozilla.org/network/protocol/about;1?what=startpage",
   classID: Components.ID("{7a2a7a56-827f-4b38-bdac-31aa7ec2971d}"),
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]),
  
@@ -136,6 +136,9 @@
 };
 
 function NSGetModule(compMgr, fileSpec) {
-  return XPCOMUtils.generateModule([AboutHome]);
+  return XPCOMUtils.generateModule([AboutStartpage]);
 }
 
+if (typeof XPCOMUtils.generateNSGetFactory == "function") {
+  const NSGetFactory = XPCOMUtils.generateNSGetFactory([AboutStartpage]);
+}

=== modified file 'content/overlay.js'
--- content/overlay.js	2010-03-04 23:14:08 +0000
+++ content/overlay.js	2010-11-10 15:13:41 +0000
@@ -65,86 +65,6 @@
   return sourcePackageName;
 }
 
-var ubufox = {
-  onAddonsLoad: function () {
-    this.isffox3 = false;
-    var labelGetUbuntu = document.getElementById("getUbuntu"); // ffox 2
-    var extensions = document.getElementById("extensions-view");
-    this.strings = document.getElementById("ubufox-strings");
-
-    if (!labelGetUbuntu) {
-      labelGetUbuntu = document.getElementById("getUbuntu3");
-      this.isffox3 = true;
-    }
-    this.initialized = true;
-
-    if (!ubufoxCheckExecutable("/usr/bin/gnome-app-install"))
-      labelGetUbuntu.setAttribute("hidden", "true");
-    else if (!this.isffox3) {
-      // this is ffox2 only because ffox3 uses a distinct overlay anchor
-      if (extensions.getAttribute("selected") != "true") {
-        labelGetUbuntu.setAttribute("hidden", "true");
-      }
-      if (extensions.getAttribute("selected") == "true") {
-        labelGetUbuntu.setAttribute("hidden", "false");
-      }
-      extensions.addEventListener("DOMAttrModified", function (e) { ubufox.onAttrModified(e); }, false);
-    }
-  },
-  onMenuItemCommand: function(e) {
-    var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-                                  .getService(Components.interfaces.nsIPromptService);
-    promptService.alert(window, this.strings.getString("helloMessageTitle"),
-                                this.strings.getString("helloMessage"));
-  },
-  onAttrModified: function(e) {
-    var labelGetUbuntu = document.getElementById("getUbuntu");
-    var extensions = document.getElementById("extensions-view");
-
-    if (!ubufoxCheckExecutable("/usr/bin/gnome-app-install")) {
-      labelGetUbuntu.setAttribute("hidden", "true");
-      return;
-    }
-    if (extensions.getAttribute("selected") != "true") {
-      labelGetUbuntu.setAttribute("hidden", "true");
-    }
-    if (extensions.getAttribute("selected") == "true") {
-      labelGetUbuntu.setAttribute("hidden", "false");
-    }
-  },
-};
-window.addEventListener("load", function(e) { ubufox.onAddonsLoad(e); }, false);
-
-function startUbuntuAddonsWizard(ev)
-{
-  var executable =
-      Components.classes['@mozilla.org/file/local;1']
-      .createInstance(Components.interfaces.nsILocalFile);
-
-  executable.initWithPath("/usr/bin/gnome-app-install");
-
-  if(!executable.exists() || !executable.isExecutable())
-         alert('Unexpected error!');
-
-  var procUtil =
-      Components.classes['@mozilla.org/process/util;1']
-      .createInstance(Components.interfaces.nsIProcess);
-
-  var nsFile = executable.QueryInterface(Components.interfaces.nsIFile);
-
-  procUtil.init(executable);
-
-  var args = new Array("--xul-extensions=firefox");
-  // we care for firefox 2 and use a special mime type to document
-  // compatibility of extensions with it
-  if (!ubufox.isffox3) {
-    args = new Array("--xul-extensions=firefox-2");
-  }
-  var res = procUtil.run(false, args, args.length);
-
-  return true;
-}
-
 function ubufoxReportBug(event) {
 
   var executable =
@@ -182,14 +102,3 @@
   var translateUrl = "https://launchpad.net/distros/ubuntu/lucid/+sources/" + getSourcePackageName() + "/+translate";
   openUILink(translateUrl, event, false, true);
 }
-
-function ubufoxCheckExecutable(filename)
-{
-  var executable =
-      Components.classes['@mozilla.org/file/local;1']
-      .createInstance(Components.interfaces.nsILocalFile);
-
-  executable.initWithPath(filename);
-  return executable.exists();
-}
-

=== modified file 'content/pluginInstallerDatasource.js'
--- content/pluginInstallerDatasource.js	2008-10-14 18:41:26 +0000
+++ content/pluginInstallerDatasource.js	2010-11-10 15:13:41 +0000
@@ -39,9 +39,9 @@
 const RDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
 const PFS_NS = "http://www.mozilla.org/2004/pfs-rdf#";
 
-function nsRDFItemUpdater(aClientOS, aChromeLocale){
+function nsRDFItemUpdater(aClientOS, aChromeLocale) {
   this._rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"]
-                        .getService(Components.interfaces.nsIRDFService);
+                               .getService(Components.interfaces.nsIRDFService);
   this._os = Components.classes["@mozilla.org/observer-service;1"]
                        .getService(Components.interfaces.nsIObserverService);
 
@@ -49,6 +49,7 @@
                       .getService(Components.interfaces.nsIXULAppInfo);
   this.appID = app.ID;
   this.buildID = app.platformBuildID;
+  this.appRelease = app.version;
 
   this.clientOS = aClientOS;
   this.chromeLocale = aChromeLocale;
@@ -56,17 +57,20 @@
   var prefBranch = Components.classes["@mozilla.org/preferences-service;1"]
                              .getService(Components.interfaces.nsIPrefBranch);
   this.dsURI = prefBranch.getCharPref("pfs.datasource.url");
+  this.distID = prefBranch.getCharPref("general.useragent.vendorSub");
 }
 
 nsRDFItemUpdater.prototype = {
-  checkForPlugin: function (aPluginRequestItem){
+  checkForPlugin: function (aPluginRequestItem) {
     var dsURI = this.dsURI;
     // escape the mimetype as mimetypes can contain '+', which will break pfs.
     dsURI = dsURI.replace(/%PLUGIN_MIMETYPE%/g, encodeURIComponent(aPluginRequestItem.mimetype));
     dsURI = dsURI.replace(/%APP_ID%/g, this.appID);
     dsURI = dsURI.replace(/%APP_VERSION%/g, this.buildID);
+    dsURI = dsURI.replace(/%APP_RELEASE%/g, this.appRelease);
     dsURI = dsURI.replace(/%CLIENT_OS%/g, this.clientOS);
     dsURI = dsURI.replace(/%CHROME_LOCALE%/g, this.chromeLocale);
+    dsURI = dsURI.replace(/%DIST_ID%/g, this.distID);
 
     var ds = this._rdfService.GetDataSource(dsURI);
     var rds = ds.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource)
@@ -78,14 +82,13 @@
     }
   },
 
-  onDatasourceLoaded: function pfs_onDatasourceLoaded (aDatasource, aPluginRequestItem){
-    var container = Components.classes["@mozilla.org/rdf/container;1"].
-                  createInstance(Components.interfaces.nsIRDFContainer);
+  onDatasourceLoaded: function pfs_onDatasourceLoaded (aDatasource, aPluginRequestItem) {
+    var container = Components.classes["@mozilla.org/rdf/container;1"]
+                              .createInstance(Components.interfaces.nsIRDFContainer);
     var resultRes = this._rdfService.GetResource("urn:mozilla:plugin-results:" + aPluginRequestItem.mimetype);
     var pluginList = aDatasource.GetTarget(resultRes, this._rdfService.GetResource(PFS_NS+"plugins"), true);
     var pluginInfos = new Array();
-  
-    container = Components.classes["@mozilla.org/rdf/container;1"].createInstance(Components.interfaces.nsIRDFContainer);
+
     try {
       container.Init(aDatasource, pluginList);
 
@@ -95,7 +98,7 @@
 
 	var target;
 	var child = children.getNext();
-	if (child instanceof Components.interfaces.nsIRDFResource){
+	if (child instanceof Components.interfaces.nsIRDFResource) {
 	  var name = this._rdfService.GetResource("http://www.mozilla.org/2004/pfs-rdf#updates");
 	  target = aDatasource.GetTarget(child, name, true);
 	}
@@ -107,13 +110,13 @@
 
 	  while (children2.hasMoreElements()) {
 	    var child2 = children2.getNext();
-	    if (child2 instanceof Components.interfaces.nsIRDFResource){
+	    if (child2 instanceof Components.interfaces.nsIRDFResource) {
 	      target2 = child2;
 	    }
 
 	    var rdfs = this._rdfService;
 
-	    function getPFSValueFromRDF(aValue){
+	    function getPFSValueFromRDF(aValue) {
 	      var rv = null;
 
 	      var myTarget = aDatasource.GetTarget(target2, rdfs.GetResource(PFS_NS + aValue), true);
@@ -128,6 +131,7 @@
 	      pid: getPFSValueFromRDF("guid"),
 	      version: getPFSValueFromRDF("version"),
 	      IconUrl: getPFSValueFromRDF("IconUrl"),
+              InstallerLocation: getPFSValueFromRDF("InstallerLocation"),
 	      desc: getPFSValueFromRDF("description"), 
 	      homepage: getPFSValueFromRDF("homepage"),
 	      XPILocation: getPFSValueFromRDF("XPILocation"),
@@ -140,24 +144,32 @@
 	      fileHint: getPFSValueFromRDF("filehint")
 	    };
 
+        // no license provided, make it accepted
+        pluginInfo.licenseAccepted = pluginInfo.licenseURL ? false : true;
+
 	    pluginInfos.push(pluginInfo);
 	  }
 	}
-	catch (ex){}
+	catch (ex) {
+          Components.utils.reportError(ex);
+        }
       }
     }
-    catch (ex){}
+    catch (ex) {
+      Components.utils.reportError(ex);
+    }
     
-    gPluginInstaller.pluginInfoReceived(pluginInfos);
+    gPluginInstaller.pluginInfoReceived(aPluginRequestItem, pluginInfos);
   },
 
-  onDatasourceError: function pfs_onDatasourceError (aPluginRequestItem, aError){
+  onDatasourceError: function pfs_onDatasourceError (aPluginRequestItem, aError) {
     this._os.notifyObservers(aPluginRequestItem, "error", aError);
-    gPluginInstaller.pluginInfoReceived(null);
-  },
+    Components.utils.reportError(aError);
+    gPluginInstaller.pluginInfoReceived(aPluginRequestItem, null);
+  }
 };
 
-function nsPluginXMLRDFDSObserver(aUpdater, aPluginRequestItem){
+function nsPluginXMLRDFDSObserver(aUpdater, aPluginRequestItem) {
   this._updater = aUpdater;
   this._item    = aPluginRequestItem;
 }
@@ -168,17 +180,17 @@
   _item     : null,
 
   // nsIRDFXMLSinkObserver
-  onBeginLoad: function(aSink){},
-  onInterrupt: function(aSink){},
-  onResume: function(aSink){},
-  onEndLoad: function(aSink){
+  onBeginLoad: function(aSink) {},
+  onInterrupt: function(aSink) {},
+  onResume: function(aSink) {},
+  onEndLoad: function(aSink) {
     aSink.removeXMLSinkObserver(this);
     
     var ds = aSink.QueryInterface(Components.interfaces.nsIRDFDataSource);
     this._updater.onDatasourceLoaded(ds, this._item);
   },
   
-  onError: function(aSink, aStatus, aErrorMsg){  
+  onError: function(aSink, aStatus, aErrorMsg) {  
     aSink.removeXMLSinkObserver(this);   
     this._updater.onDatasourceError(this._item, aStatus.toString());
   }

=== modified file 'content/pluginInstallerService.js'
--- content/pluginInstallerService.js	2009-09-15 08:40:19 +0000
+++ content/pluginInstallerService.js	2010-11-10 15:13:41 +0000
@@ -36,54 +36,299 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-var PluginXPIInstallService = {
-  
-  init: function () 
-  {
-  },
-
-  pluginPidArray: null,
-
-  startPluginInstallation: function (aPluginXPIUrlsArray,
-				     aPluginHashes,
-				     aPluginPidArray) {
-     this.pluginPidArray = aPluginPidArray;
-
-     var xpiManager = Components.classes["@mozilla.org/xpinstall/install-manager;1"]
-                                .createInstance(Components.interfaces.nsIXPInstallManager);
-     xpiManager.initManagerWithHashes(aPluginXPIUrlsArray, aPluginHashes,
-                                      aPluginXPIUrlsArray.length, this);
-  },
-
-  // XPI progress listener stuff
-  onStateChange: function (aIndex, aState, aValue)
-  {
-    // get the pid to return to the wizard
-    var pid = this.pluginPidArray[aIndex];
-    var errorMsg;
-
-    if (aState == Components.interfaces.nsIXPIProgressDialog.INSTALL_DONE) {
-      if (aValue != 0) {
-        var xpinstallStrings = document.getElementById("xpinstallStrings");
-        try {
-          errorMsg = xpinstallStrings.getString("error" + aValue);
-        }
-        catch (e) {
-          errorMsg = xpinstallStrings.getFormattedString("unknown.error", [aValue]);
-        }
-      }
-    }
-
-    gPluginInstaller.pluginXPIInstallationProgress(pid, aState, errorMsg);
-
-  },
-
-  onProgress: function (aIndex, aValue, aMaxValue)
-  {
-    // get the pid to return to the wizard
-    var pid = this.pluginPidArray[aIndex];
-
-    gPluginInstaller.pluginXPIInstallationProgressMeter(pid, aValue, aMaxValue);
+Components.utils.import("resource://gre/modules/AddonManager.jsm");
+
+const DOWNLOAD_STARTED = 0;
+const DOWNLOAD_FINISHED = 1;
+const INSTALL_STARTED = 2;
+const INSTALL_FINISHED = 3;
+const INSTALLS_COMPLETE = 4;
+
+function getLocalizedError(key)
+{
+  return document.getElementById("xpinstallStrings").getString(key);
+}
+
+function binaryToHex(input)
+{
+  return [('0' + input.charCodeAt(i).toString(16)).slice(-2)
+          for (i in input)].join('');
+}
+
+function verifyHash(aFile, aHash)
+{
+  try {
+    var [, method, hash] = /^([A-Za-z0-9]+):(.*)$/.exec(aHash);
+
+    var fis = Components.classes['@mozilla.org/network/file-input-stream;1'].
+      createInstance(Components.interfaces.nsIFileInputStream);
+    fis.init(aFile, -1, -1, 0);
+
+    var hasher = Components.classes['@mozilla.org/security/hash;1'].
+      createInstance(Components.interfaces.nsICryptoHash);
+    hasher.initWithString(method);
+    hasher.updateFromStream(fis, -1);
+    dlhash = binaryToHex(hasher.finish(false));
+    return dlhash == hash;
+  }
+  catch (e) {
+    Components.utils.reportError(e);
+    return false;
+  }
+}
+
+function InstallerObserver(aPlugin)
+{
+  this._plugin = aPlugin;
+  this._init();
+}
+
+InstallerObserver.prototype = {
+  _init: function()
+  {
+    try {
+      var ios = Components.classes["@mozilla.org/network/io-service;1"].
+        getService(Components.interfaces.nsIIOService);
+      var uri = ios.newURI(this._plugin.InstallerLocation, null, null);
+      uri.QueryInterface(Components.interfaces.nsIURL);
+
+      // Use a local filename appropriate for the OS
+      var leafName = uri.fileName;
+      var os = Components.classes["@mozilla.org/xre/app-info;1"]
+                         .getService(Components.interfaces.nsIXULRuntime)
+                         .OS;
+      if (os == "WINNT" && leafName.indexOf(".") < 0)
+        leafName += ".exe";
+
+      var dirs = Components.classes["@mozilla.org/file/directory_service;1"].
+        getService(Components.interfaces.nsIProperties);
+
+      var resultFile = dirs.get("TmpD", Components.interfaces.nsIFile);
+      resultFile.append(leafName);
+      resultFile.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE,
+                              0770);
+
+      var channel = ios.newChannelFromURI(uri);
+      this._downloader =
+        Components.classes["@mozilla.org/network/downloader;1"].
+          createInstance(Components.interfaces.nsIDownloader);
+      this._downloader.init(this, resultFile);
+      channel.notificationCallbacks = this;
+
+      this._fireNotification(DOWNLOAD_STARTED, null);
+
+      channel.asyncOpen(this._downloader, null);
+    }
+    catch (e) {
+      Components.utils.reportError(e);
+      this._fireNotification(INSTALL_FINISHED, getLocalizedError("error-228"));
+      if (resultFile && resultFile.exists())
+        resultfile.remove(false);
+    }
+  },
+
+  /**
+   * Inform the gPluginInstaller about what's going on.
+   */
+  _fireNotification: function(aStatus, aErrorMsg)
+  {
+    gPluginInstaller.pluginXPIInstallationProgress(this._plugin.pid,
+                                                   aStatus, aErrorMsg);
+
+    if (aStatus == INSTALL_FINISHED) {
+      --PluginInstallService._installersPending;
+      PluginInstallService._fireFinishedNotification();
+    }
+  },
+
+  QueryInterface: function(iid)
+  {
+    if (iid.equals(Components.interfaces.nsISupports) ||
+        iid.equals(Components.interfaces.nsIInterfaceRequestor) ||
+        iid.equals(Components.interfaces.nsIDownloadObserver) ||
+        iid.equals(Components.interfaces.nsIProgressEventSink))
+      return this;
+
+    throw Components.results.NS_ERROR_NO_INTERFACE;
+  },
+
+  getInterface: function(iid)
+  {
+    if (iid.equals(Components.interfaces.nsIProgressEventSink))
+      return this;
+
+    return null;
+  },
+
+  onDownloadComplete: function(downloader, request, ctxt, status, result)
+  {
+    if (!Components.isSuccessCode(status)) {
+      // xpinstall error 228 is "Download Error"
+      this._fireNotification(INSTALL_FINISHED, getLocalizedError("error-228"));
+      result.remove(false);
+      return;
+    }
+
+    this._fireNotification(DOWNLOAD_FINISHED);
+
+    if (this._plugin.InstallerHash &&
+        !verifyHash(result, this._plugin.InstallerHash)) {
+      // xpinstall error 261 is "Invalid file hash..."
+      this._fireNotification(INSTALL_FINISHED, getLocalizedError("error-261"));
+      result.remove(false);
+      return;
+    }
+
+    this._fireNotification(INSTALL_STARTED);
+
+    result.QueryInterface(Components.interfaces.nsILocalFile);
+    try {
+      // Make sure the file is executable
+      result.permissions = 0770;
+      var process = Components.classes["@mozilla.org/process/util;1"]
+                              .createInstance(Components.interfaces.nsIProcess);
+      process.init(result);
+      var self = this;
+      process.runAsync([], 0, {
+        observe: function(subject, topic, data) {
+          if (topic != "process-finished") {
+            Components.utils.reportError("Failed to launch installer");
+            self._fireNotification(INSTALL_FINISHED,
+                                   getLocalizedError("error-207"));
+          }
+          else if (process.exitValue != 0) {
+            Components.utils.reportError("Installer returned exit code " + process.exitValue);
+            self._fireNotification(INSTALL_FINISHED,
+                                   getLocalizedError("error-203"));
+          }
+          else {
+            self._fireNotification(INSTALL_FINISHED, null);
+          }
+          result.remove(false);
+        }
+      });
+    }
+    catch (e) {
+      Components.utils.reportError(e);
+      this._fireNotification(INSTALL_FINISHED, getLocalizedError("error-207"));
+      result.remove(false);
+    }
+  },
+
+  onProgress: function(aRequest, aContext, aProgress, aProgressMax)
+  {
+    gPluginInstaller.pluginInstallationProgressMeter(this._plugin.pid,
+                                                     aProgress,
+                                                     aProgressMax);
+  },
+
+  onStatus: function(aRequest, aContext, aStatus, aStatusArg)
+  {
+    /* pass */
+  }
+};
+
+var PluginInstallService = {
+
+  /**
+   * Start installation of installers and XPI plugins.
+   * @param aInstallerPlugins An array of objects which should have the
+   *                          properties "pid", "InstallerLocation",
+   *                          and "InstallerHash"
+   * @param aXPIPlugins       An array of objects which should have the
+   *                          properties "pid", "XPILocation",
+   *                          and "XPIHash"
+   */
+  startPluginInstallation: function (aInstallerPlugins,
+                                     aXPIPlugins)
+  {
+    this._xpiPlugins = aXPIPlugins;
+    this._xpisPending = aXPIPlugins.length;
+
+    aXPIPlugins.forEach(function(plugin) {
+      AddonManager.getInstallForURL(plugin.XPILocation, function(install) {
+        install.addListener(PluginInstallService);
+        install.install();
+      }, "application/x-xpinstall", plugin.XPIHash);
+    });
+
+    // InstallerObserver may finish immediately so we must initialise the
+    // installers after setting the number of installers and xpis pending
+    this._installersPending = aInstallerPlugins.length;
+    this._installerPlugins = [new InstallerObserver(plugin)
+                              for each (plugin in aInstallerPlugins)];
+  },
+
+  _fireFinishedNotification: function()
+  {
+    if (this._installersPending == 0 && this._xpisPending == 0)
+      gPluginInstaller.pluginXPIInstallationProgress(null, INSTALLS_COMPLETE, null);
+  },
+
+  getPidForInstall: function(install) {
+    for (let i = 0; i < this._xpiPlugins.length; i++) {
+      if (install.sourceURI.spec == this._xpiPlugins[i].XPILocation)
+        return this._xpiPlugins[i].pid;
+    }
+    return -1;
+  },
+
+  // InstallListener interface
+  onDownloadStarted: function(install) {
+    var pid = this.getPidForInstall(install);
+    gPluginInstaller.pluginXPIInstallationProgress(pid, DOWNLOAD_STARTED, null);
+  },
+
+  onDownloadProgress: function(install) {
+    var pid = this.getPidForInstall(install);
+    gPluginInstaller.pluginXPIInstallationProgressMeter(pid, install.progress,
+                                                     install.maxProgress);
+  },
+
+  onDownloadEnded: function(install) {
+    var pid = this.getPidForInstall(install);
+    gPluginInstaller.pluginXPIInstallationProgress(pid, DOWNLOAD_FINISHED, null);
+  },
+
+  onDownloadFailed: function(install) {
+    var pid = this.getPidForInstall(install);
+    switch (install.error) {
+    case AddonManager.ERROR_NETWORK_FAILURE:
+      var errorMsg = getLocalizedError("error-228");
+      break;
+    case AddonManager.ERROR_INCORRECT_HASH:
+      var errorMsg = getLocalizedError("error-261");
+      break;
+    case AddonManager.ERROR_CORRUPT_FILE:
+      var errorMsg = getLocalizedError("error-207");
+      break;
+    }
+    gPluginInstaller.pluginXPIInstallationProgress(pid, INSTALL_FINISHED, errorMsg);
+
+    this._xpisPending--;
+    this._fireFinishedNotification();
+  },
+
+  onInstallStarted: function(install) {
+    var pid = this.getPidForInstall(install);
+    gPluginInstaller.pluginXPIInstallationProgress(pid, INSTALL_STARTED, null);
+  },
+
+  onInstallEnded: function(install, addon) {
+    var pid = this.getPidForInstall(install);
+    gPluginInstaller.pluginXPIInstallationProgress(pid, INSTALL_FINISHED, null);
+
+    this._xpisPending--;
+    this._fireFinishedNotification();
+  },
+
+  onInstallFailed: function(install) {
+    var pid = this.getPidForInstall(install);
+    gPluginInstaller.pluginXPIInstallationProgress(pid, INSTALL_FINISHED,
+                                                   getLocalizedError("error-203"));
+
+    this._xpisPending--;
+    this._fireFinishedNotification();
   }
 }
 
@@ -95,13 +340,11 @@
   mAptPidArray: null,
   mRunning: false,
 
-  install: function(aAptUrlArray,
-		    aAptPidArray,
+  install: function(aAptPlugins,
 		    aAptInstallerService) {
 
     this.mAptInstallerService = aAptInstallerService;
-    this.mAptUrlArray = aAptUrlArray;
-    this.mAptPidArray = aAptPidArray;
+    this.mAptPlugins = aAptPlugins;
     this.mRunning = true;
 
     //    var thread = Components.classes["@mozilla.org/thread;1"]
@@ -112,9 +355,9 @@
 
   run: function()
   {
-    for (var i = 0; i < this.mAptUrlArray.length; i++) {
-      var aptUrl = this.mAptUrlArray[i];
-      var aptPid = this.mAptPidArray[i];
+    for (var i = 0; i < this.mAptPlugins.length; i++) {
+      var aptUrl = this.mAptPlugins[i].XPILocation;
+      var aptPid = this.mAptPlugins[i].pid;
       this.mAptInstallerService.onNotifyStart(aptUrl, aptPid);
 
       var executable =
@@ -125,7 +368,7 @@
 
       if(!executable.exists() || !executable.isExecutable()) {
         window.alert('Unexpected error!');
-        this.mAptInstallerService.onNotifyResult(aptUrl, aptPid, -1 );
+        this.mAptInstallerService.onNotifyResult(aptUrl, aptPid, -1);
         continue;
       }
 
@@ -181,9 +424,8 @@
 
   pluginPidArray: null,
 
-  startPluginInstallation: function (aPluginAptUrlsArray,
-				     aPluginPidArray) {
-    AptInstaller.install(aPluginAptUrlsArray, aPluginPidArray, this);
+  startPluginInstallation: function (aAptPlugins) {
+    AptInstaller.install(aAptPlugins, this);
   },
 
   onNotifyStart: function (aptUrl, aptPid) {

=== modified file 'content/pluginInstallerWizard.js'
--- content/pluginInstallerWizard.js	2010-04-08 11:09:28 +0000
+++ content/pluginInstallerWizard.js	2010-11-10 15:13:41 +0000
@@ -64,14 +64,15 @@
   // how many plugins are to be installed
   this.pluginsToInstallNum = 0;
 
-  this.mTab = null;
   this.mBrowser = null;
   this.mSuccessfullPluginInstallation = 0;
+  this.mNeedsRestart = false;
 
   this.mPluginPidArray = new Object();
   // arguments[0] is an array that contains two items:
   //     an array of mimetypes that are missing
-  //     a reference to the tab that needs them, so we can reload it
+  //     a reference to the browser that needs them, 
+  //        so we can notify which browser can be reloaded.
 
   if ("arguments" in window) {
     for (var item in window.arguments[0].plugins){
@@ -81,8 +82,7 @@
       this.mPluginRequestArrayLength++;
     }
 
-    this.mBrowser = window.arguments[0].browser; // ffox 3
-    this.mTab = window.arguments[0].tab; // ffox 2
+    this.mBrowser = window.arguments[0].browser;
   }
 
   this.WSPluginCounter = 0;
@@ -100,14 +100,14 @@
   // initiate the datasource call
   var rdfUpdater = new nsRDFItemUpdater(this.getOS(), this.getChromeLocale());
 
-  for (item in this.mPluginRequestArray) {
+  for (var item in this.mPluginRequestArray) {
     rdfUpdater.checkForPlugin(this.mPluginRequestArray[item]);
   }
 }
 
 // aPluginInfo is null if the datasource call failed, and pid is -1 if
 // no matching plugin was found.
-nsPluginInstallerWizard.prototype.pluginInfoReceived = function (aPluginInfos){
+nsPluginInstallerWizard.prototype.pluginInfoReceived = function (aPluginRequestItem, aPluginInfos){
   this.WSPluginCounter++;
 
   if (aPluginInfos ) {
@@ -121,7 +121,7 @@
       aPluginInfo = aPluginInfos[i];
       resultSetMimeType = aPluginInfo.requestedMimetype;
       if (aPluginInfo && aPluginInfo.pid != -1 &&
-	  ( aPluginInfo.XPILocation || aPluginInfo.manualInstallationURL )) {
+	  ( aPluginInfo.XPILocation || aPluginInfo.manualInstallationURL || aPluginInfo.InstallerLocation)) {
 	hasResults = true;
 	filteredPluginInfoSet.push(aPluginInfo);
 	this.mPluginPidArray[aPluginInfo.pid] = aPluginInfo;
@@ -130,10 +130,10 @@
 
     if(filteredPluginInfoSet.length > 0)
     {
-      this.mPluginInfoArray[resultSetMimeType] = filteredPluginInfoSet;
+      this.mPluginInfoArray[aPluginRequestItem.mimetype] = filteredPluginInfoSet;
       this.mPluginInfoArrayLength++;
     } else {
-      this.mPluginNotFoundArray[resultSetMimeType] = filteredPluginInfoSet;
+      this.mPluginNotFoundArray[aPluginRequestItem.mimetype] = aPluginRequestItem;
       this.mPluginNotFoundArrayLength++;
     }
   }
@@ -148,18 +148,18 @@
 
   if (this.WSPluginCounter == this.mPluginRequestArrayLength) {
     // check if no plugins were found
-    if (this.mPluginInfoArrayLength == 0 && this.mPluginInfoAptArrayLength == 0) {
-      this.advancePage("lastpage", true, false, false);
+    if (this.mPluginInfoArrayLength == 0) {
+      this.advancePage("lastpage");
     } else {
       // we want to allow user to cancel
-      this.advancePage(null, true, false, true);
+      this.advancePage(null);
     }
   } else {
     // process more.
   }
 }
 
-nsPluginInstallerWizard.prototype.createPluginSetGroupBox = function () {
+nsPluginInstallerWizard.prototype.createPluginSetGroupBox = function (mimetype) {
 
   var stringBundle = document.getElementById("ubufoxPluginWizardString");
   var gbox = document.createElement("vbox");
@@ -193,11 +193,11 @@
   var groupBox = null;
   var lastSibling = null;
 
-  for (mimetype in this.mPluginInfoArray){
+  for (var mimetype in this.mPluginInfoArray){
     // [plugin image] [Plugin_Name Plugin_Version]
     var pluginInfoSet = this.mPluginInfoArray[mimetype];
     var firstPluginSet = (groupBox == null);
-    groupBox = this.createPluginSetGroupBox(document, mimetype, pluginInfoSet);
+    groupBox = this.createPluginSetGroupBox(mimetype);
 
     if(firstPluginSet) {
       this.mPluginPlaceHolder = document.getElementById("pluginselection-placeholder");
@@ -275,6 +275,7 @@
     if (pluginInfo.InstallerShowsUI == "true")
       hasPluginWithInstallerUI = true;
 
+    // keep a running count of plugins the user wants to install
     this.pluginsToInstallNum++;
   }
 
@@ -290,14 +291,14 @@
   var mime = selectedItem._ubufoxPluginInfoMimeType;
   this.mMimeTypePluginSelections[mime] = selectedItem._ubufoxPluginInfo.pid;
 
-  let count  = 0;
-  for (mime in this.mMimeTypePluginSelections) {
+  this.pluginsToInstallNum = 0;
+  for (var mime in this.mMimeTypePluginSelections) {
     if(this.mMimeTypePluginSelections[mime] && this.mMimeTypePluginSelections[mime] != "-1")
-      count++;
+      this.pluginsToInstallNum++;
   }
  
   // if no plugins are checked, don't allow to advance
-  if (count > 0)
+  if (this.pluginsToInstallNum > 0)
     this.canAdvance(true);
   else
     this.canAdvance(false);
@@ -321,7 +322,7 @@
 
   // only add if a license is provided and the plugin was selected to
   // be installed
-  for (mimetype in this.mMimeTypePluginSelections){
+  for (var mimetype in this.mMimeTypePluginSelections){
     var pid = this.mMimeTypePluginSelections[mimetype];
     var pluginInfo = this.mPluginPidArray[pid];
     if (pluginInfo && pluginInfo.licenseURL && (pluginInfo.licenseURL != "")) {
@@ -331,7 +332,7 @@
 
   if (this.mPluginLicenseArray.length == 0) {
     // no plugins require licenses
-    this.advancePage(null, true, false, false);
+    this.advancePage(null);
   } else {
     this.licenseAcceptCounter = 0;
 
@@ -389,7 +390,7 @@
 
   this.canAdvance(false);
 
-  loadFlags = Components.interfaces.nsIWebNavigation.LOAD_FLAGS_NONE;
+  var loadFlags = Components.interfaces.nsIWebNavigation.LOAD_FLAGS_NONE;
 
   document.getElementById("licenseIFrame").webNavigation.loadURI(pluginInfo.licenseURL, loadFlags, null, null, null);
 
@@ -447,60 +448,46 @@
     this.canAdvance(aAccepted);
 }
 
-nsPluginInstallerWizard.prototype.advancePage = function (aPageId, aCanAdvance, aCanRewind, aCanCancel){
+nsPluginInstallerWizard.prototype.advancePage = function (aPageId){
   this.canAdvance(true);
   document.getElementById("plugin-installer-wizard").advance(aPageId);
-
-  this.canAdvance(aCanAdvance);
-  this.canRewind(aCanRewind);
-  this.canCancel(aCanCancel);
 }
 
 nsPluginInstallerWizard.prototype.startPluginInstallation = function (){
   this.canAdvance(false);
   this.canRewind(false);
 
-  // since the user can choose what plugins to install, we need to store
-  // which ones were choosen, as nsIXPInstallManager returns an index and not the
-  // mimetype.  So store the pids.
-
-  // for ubutfox we deal with multiple cases: first case is XPIInstall, which will
+  // for ubufox we deal with multiple cases: first case is XPIInstall, which will
   // run the "normal" XPIInstall process; second case is XPIInstall url contains
   // and apt: protocol url ... this will run apt protocol handler 
-  var pluginURLArray = new Array();
-  var pluginHashArray = new Array();
-  var pluginPidArray = new Array();
-  this.mAptPluginURLArray = new Array();
-  this.mAptPluginPidArray = new Array();
-
-  for (mime in this.mMimeTypePluginSelections) {
-    var pluginPid = this.mMimeTypePluginSelections[mime];
-    var pluginItem = this.mPluginPidArray[pluginPid];
-
-    // only push to the array if it has an XPILocation, else nsIXPInstallManager
-    // will complain.
-    if (pluginItem && pluginItem.XPILocation && pluginItem.XPILocation.indexOf("apt:") != 0 && pluginItem.licenseAccepted) {
-      pluginURLArray.push(pluginItem.XPILocation);
-      pluginHashArray.push(pluginItem.XPIHash);
-      pluginPidArray.push(pluginItem.pid);
-    } else if (pluginItem && pluginItem.XPILocation && pluginItem.XPILocation.indexOf("apt:") == 0) {
-      this.mAptPluginURLArray.push(pluginItem.XPILocation);
-      this.mAptPluginPidArray.push(pluginPid);
-    } else {
-      window.alert("Unhandled mime install flavour (supported: vendor, apt)");
-      continue;
+  var installerPlugins = [];
+  var xpiPlugins = [];
+  this.aptPlugins = [];
+
+  for (var mime in this.mMimeTypePluginSelections) {
+    var pluginItem = this.mPluginPidArray[this.mMimeTypePluginSelections[mime]];
+
+    if (pluginItem && pluginItem.licenseAccepted) {
+      if (pluginItem.InstallerLocation)
+        installerPlugins.push(pluginItem);
+      else if (pluginItem.XPILocation && pluginItem.XPILocation.indexOf("apt:") != 0)
+        xpiPlugins.push(pluginItem);
+      else if (pluginItem.XPILocation && pluginItem.XPILocation.indexOf("apt:") == 0)
+        this.aptPlugins.push(pluginItem);
+      else {
+        window.alert("Unhandled mime install flavour (supported: vendor, apt)");
+        continue;
+      }
     }
   }
 
-  if (pluginURLArray.length > 0)
-    PluginXPIInstallService.startPluginInstallation(pluginURLArray,
-						    pluginHashArray,
-						    pluginPidArray);
-  else if (this.mAptPluginURLArray.length > 0)
-    PluginAPTInstallService.startPluginInstallation(this.mAptPluginURLArray,
-						    this.mAptPluginPidArray);
+  if (installerPlugins.length > 0 || xpiPlugins.length > 0)
+    PluginXPIInstallService.startPluginInstallation(installerPlugins,
+						    xpiPlugins);
+  else if (this.aptPlugins.length > 0)
+    PluginAPTInstallService.startPluginInstallation(this.aptPlugins);
   else
-    this.advancePage(null, true, false, false);
+    this.advancePage(null);
 }
 
 /*
@@ -530,6 +517,8 @@
 
     case 2:
       statMsg = this.getFormattedString("pluginInstallation.install.start", [pluginInfo.name]);
+      var progressElm = document.getElementById("plugin_install_progress");
+      progressElm.setAttribute("mode", "undetermined");
       break;
     case 6:
       statMsg = "APT - " + this.getFormattedString("pluginInstallation.install.start", [pluginInfo.name]);
@@ -555,11 +544,10 @@
       break;
 
     case 4:
-      PluginAPTInstallService.startPluginInstallation(this.mAptPluginURLArray,
-						      this.mAptPluginPidArray);
+      PluginAPTInstallService.startPluginInstallation(this.aptPlugins);
       break;
     case 8:
-      this.advancePage(null, true, false, false);
+      this.advancePage(null);
       statMsg = this.getString("pluginInstallation.complete");
       break;
     default:
@@ -630,15 +618,12 @@
   var notInstalledList = "?action=missingplugins";
   var myRows = document.getElementById("pluginResultList");
 
-  this.mNeedsRestart = false;
-
   // clear children
   for (var run = myRows.childNodes.length; run--; run > 0)
     myRows.removeChild(myRows.childNodes.item(run));
 
-  for (mimetype in this.mMimeTypePluginSelections) {
-    var pid = this.mMimeTypePluginSelections[mimetype];
-    var pluginInfoItem = this.mPluginPidArray[pid];
+  for (var mimetype in this.mMimeTypePluginSelections) {
+    var pluginInfoItem = this.mPluginPidArray[this.mMimeTypePluginSelections[mimetype]];
     // [plugin image] [Plugin_Name Plugin_Version] [Success/Failed] [Manual Install (if Failed)]
 
     var myPluginItem = pluginInfoItem; //this.mPluginInfoArray[pluginInfoItem];
@@ -651,7 +636,7 @@
       notInstalledList += "&mimetype=" + pluginInfoItem;
     } else if (myPluginItem.licenseURL && !myPluginItem.licenseAccepted) {
       statusMsg = this.getString("pluginInstallationSummary.licenseNotAccepted");
-    } else if (!myPluginItem.XPILocation) {
+    } else if (!myPluginItem.XPILocation && !myPluginItem.InstallerLocation) {
       statusMsg = this.getString("pluginInstallationSummary.notAvailable");
       notInstalledList += "&mimetype=" + pluginInfoItem;
     } else {
@@ -660,12 +645,12 @@
 
       // only check needsRestart if the plugin was successfully installed.
       if (myPluginItem.needsRestart)
-	this.mNeedsRestart = false;
+	this.mNeedsRestart = true;
     }
 
     // manual url - either returned from the webservice or the pluginspage attribute
     var manualUrl;
-    if ((myPluginItem.error || !myPluginItem.XPILocation) && (myPluginItem.manualInstallationURL || this.mPluginRequestArray[myPluginItem.requestedMimetype].pluginsPage)){
+    if ((myPluginItem.error || (!myPluginItem.XPILocation && !myPluginItem.InstallerLocation)) && (myPluginItem.manualInstallationURL || this.mPluginRequestArray[myPluginItem.requestedMimetype].pluginsPage)){
       manualUrl = myPluginItem.manualInstallationURL ? myPluginItem.manualInstallationURL : this.mPluginRequestArray[myPluginItem.requestedMimetype].pluginsPage;
     }
 
@@ -680,10 +665,10 @@
 
   // handle plugins we couldn't find
   for (pluginInfoItem in this.mPluginNotFoundArray){
-    var pluginRequest = this.mPluginRequestArray[pluginInfoItem];
+    var pluginRequest = this.mPluginNotFoundArray[pluginInfoItem];
 
     // if there is a pluginspage, show UI
-    if (pluginRequest) {
+    if (pluginRequest.pluginsPage) {
       this.addPluginResultRow(
           "",
           this.getFormattedString("pluginInstallation.unknownPlugin", [pluginInfoItem]),
@@ -716,28 +701,43 @@
     "&appID=" + app.ID +
     "&appVersion=" + app.platformBuildID +
     "&clientOS=" + this.getOS() +
-    "&chromeLocale=" + this.getChromeLocale();
+    "&chromeLocale=" + this.getChromeLocale() +
+    "&appRelease=" + app.version;
 
   document.getElementById("moreInfoLink").addEventListener("click", function() { gPluginInstaller.loadURL("https://pfs.mozilla.org/plugins/" + notInstalledList) }, false);
 
+  if (this.mNeedsRestart) {
+    var cancel = document.getElementById("plugin-installer-wizard").getButton("cancel");
+    cancel.label = this.getString("pluginInstallation.close.label");
+    cancel.accessKey = this.getString("pluginInstallation.close.accesskey");
+    var finish = document.getElementById("plugin-installer-wizard").getButton("finish");
+    finish.label = this.getFormattedString("pluginInstallation.restart.label", [app.name]);
+    finish.accessKey = this.getString("pluginInstallation.restart.accesskey");
+    this.canCancel(true);
+  }
+  else {
+    this.canCancel(false);
+  }
+
   this.canAdvance(true);
   this.canRewind(false);
-  this.canCancel(false);
 }
 
 nsPluginInstallerWizard.prototype.loadURL = function (aUrl){
   // Check if the page where the plugin came from can load aUrl before
-  // loading it, and do *not* allow loading javascript: or data: URIs.
-  var pluginPage = window.opener.content.location.href;
+  // loading it, and do *not* allow loading URIs that would inherit our
+  // principal.
+  
+  var pluginPagePrincipal =
+    window.opener.content.document.nodePrincipal;
 
   const nsIScriptSecurityManager =
     Components.interfaces.nsIScriptSecurityManager;
-  var secMan =
-    Components.classes["@mozilla.org/scriptsecuritymanager;1"]
-    .getService(nsIScriptSecurityManager);
+  var secMan = Components.classes["@mozilla.org/scriptsecuritymanager;1"]
+                         .getService(nsIScriptSecurityManager);
 
-  secMan.checkLoadURIStr(pluginPage, aUrl,
-                         nsIScriptSecurityManager.DISALLOW_SCRIPT_OR_DATA);
+  secMan.checkLoadURIStrWithPrincipal(pluginPagePrincipal, aUrl,
+    nsIScriptSecurityManager.DISALLOW_INHERIT_PRINCIPAL);
 
   window.opener.open(aUrl);
 }
@@ -792,6 +792,8 @@
   this.pid = aResult.pid;
   this.version = aResult.version;
   this.IconUrl = aResult.IconUrl;
+  this.InstallerLocation = aResult.InstallerLocation;
+  this.InstallerHash = aResult.InstallerHash;
   this.XPILocation = aResult.XPILocation;
   this.XPIHash = aResult.XPIHash;
   this.InstallerShowsUI = aResult.InstallerShowsUI;
@@ -816,7 +818,6 @@
 }
 
 function wizardFinish(){
-  // we restart if we have no choice ...
   if (gPluginInstaller.mNeedsRestart) {
     // Notify all windows that an application quit has been requested.
     var os = Components.classes["@mozilla.org/observer-service;1"]
@@ -835,21 +836,26 @@
     }
   }
 
-  if (gPluginInstaller.mBrowser) { // ffox 3 code can autoscan ...
-    // always refresh
-    var event = document.createEvent("Events");
-    event.initEvent("NewPluginInstalled", true, true);
-    var dispatched = gPluginInstaller.mBrowser.dispatchEvent(event);
-  }
-  else if (gPluginInstaller.mTab) { // ffox 2 code can autoscan ...
-    if ((gPluginInstaller.mSuccessfullPluginInstallation > 0) &&
-       (gPluginInstaller.mPluginInfoArrayLength != 0)) {
-      // clear the tab's plugin list only if we installed at least one plugin
-      gPluginInstaller.mTab.missingPlugins = null;
-      // reset UI
-      window.opener.gMissingPluginInstaller.closeNotification();
-      // reload the browser to make the new plugin show
-      window.opener.getBrowser().reloadTab(gPluginInstaller.mTab);
+  // don't refresh if no plugins were found or installed
+  if ((gPluginInstaller.mSuccessfullPluginInstallation > 0) &&
+      (gPluginInstaller.mPluginInfoArray.length != 0)) {
+
+    // reload plugins so JS detection works immediately
+    try {
+      var ph = Components.classes["@mozilla.org/plugin/host;1"]
+                         .getService(Components.interfaces.nsIPluginHost);
+      ph.reloadPlugins(false);
+    }
+    catch (e) {
+      // reloadPlugins throws an exception if there were no plugins to load
+    }
+
+    if (gPluginInstaller.mBrowser) {
+      // notify listeners that a plugin is installed,
+      // so that they can reset the UI and update the browser.
+      var event = document.createEvent("Events");
+      event.initEvent("NewPluginInstalled", true, true);
+      gPluginInstaller.mBrowser.dispatchEvent(event);
     }
   }
 

=== modified file 'content/pluginInstallerWizard.xul'
--- content/pluginInstallerWizard.xul	2008-10-14 19:25:33 +0000
+++ content/pluginInstallerWizard.xul	2010-11-10 15:13:41 +0000
@@ -55,9 +55,9 @@
         onload="wizardInit()"
         onwizardfinish="return wizardFinish();">
 
-  <script type="application/x-javascript" src="chrome://ubufox/content/pluginInstallerWizard.js"/>
-  <script type="application/x-javascript" src="chrome://ubufox/content/pluginInstallerDatasource.js"/>
-  <script type="application/x-javascript" src="chrome://ubufox/content/pluginInstallerService.js"/>
+  <script type="application/javascript" src="chrome://ubufox/content/pluginInstallerWizard.js"/>
+  <script type="application/javascript" src="chrome://ubufox/content/pluginInstallerDatasource.js"/>
+  <script type="application/javascript" src="chrome://ubufox/content/pluginInstallerService.js"/>
 
   <stringbundleset id="pluginSet">
     <stringbundle id="brandStrings" src="chrome://branding/locale/brand.properties"/>

=== removed file 'content/ubuntuAddonsOverlay.ffox2.xul'
--- content/ubuntuAddonsOverlay.ffox2.xul	2008-02-13 15:15:32 +0000
+++ content/ubuntuAddonsOverlay.ffox2.xul	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-  -   Version: MPL 1.1/GPL 2.0/LGPL 2.1
-  -
-  - The contents of this file are subject to the Mozilla Public License Version
-  - 1.1 (the "License"); you may not use this file except in compliance with
-  - the License. You may obtain a copy of the License at
-  - http://www.mozilla.org/MPL/
-  - 
-  - Software distributed under the License is distributed on an "AS IS" basis,
-  - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-  - for the specific language governing rights and limitations under the
-  - License.
-  -
-  - The Original Code is distro-mods.
-  -
-  - The Initial Developer of the Original Code is
-  - Canonical Ltd.
-  - Portions created by the Initial Developer are Copyright (C) 2007
-  - the Initial Developer. All Rights Reserved.
-  -
-  - Contributor(s):
-  -
-  - Alternatively, the contents of this file may be used under the terms of
-  - either the GNU General Public License Version 2 or later (the "GPL"), or
-  - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-  - in which case the provisions of the GPL or the LGPL are applicable instead
-  - of those above. If you wish to allow use of your version of this file only
-  - under the terms of either the GPL or the LGPL, and not to allow others to
-  - use your version of this file under the terms of the MPL, indicate your
-  - decision by deleting the provisions above and replace them with the notice
-  - and other provisions required by the GPL or the LGPL. If you do not delete
-  - the provisions above, a recipient may use your version of this file under
-  - the terms of any one of the MPL, the GPL or the LGPL.
-  - 
-  - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://ubufox/skin/overlay.css" type="text/css"?>
-<!DOCTYPE overlay SYSTEM "chrome://ubufox/locale/ubufox.dtd">
-<overlay id="ubufox-overlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="overlay.js"/>
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="ubufox-strings" src="chrome://ubufox/locale/ubufox.properties"/>
-  </stringbundleset>
-
-  <hbox id="commandBarBottom">
-    <label id="getUbuntu" getMoreURL="http://www.google.com" class="text-link" 
-           onclick="return startUbuntuAddonsWizard(event);"
-           onload="ubufoxCheckExecutable();"
-           value="&ubufox.getubuntuextension;"/>
-  </hbox>
-</overlay>

=== removed file 'content/ubuntuAddonsOverlay.xul'
--- content/ubuntuAddonsOverlay.xul	2008-02-13 15:15:32 +0000
+++ content/ubuntuAddonsOverlay.xul	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-  -   Version: MPL 1.1/GPL 2.0/LGPL 2.1
-  -
-  - The contents of this file are subject to the Mozilla Public License Version
-  - 1.1 (the "License"); you may not use this file except in compliance with
-  - the License. You may obtain a copy of the License at
-  - http://www.mozilla.org/MPL/
-  - 
-  - Software distributed under the License is distributed on an "AS IS" basis,
-  - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-  - for the specific language governing rights and limitations under the
-  - License.
-  -
-  - The Original Code is distro-mods.
-  -
-  - The Initial Developer of the Original Code is
-  - Canonical Ltd.
-  - Portions created by the Initial Developer are Copyright (C) 2007
-  - the Initial Developer. All Rights Reserved.
-  -
-  - Contributor(s):
-  -
-  - Alternatively, the contents of this file may be used under the terms of
-  - either the GNU General Public License Version 2 or later (the "GPL"), or
-  - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-  - in which case the provisions of the GPL or the LGPL are applicable instead
-  - of those above. If you wish to allow use of your version of this file only
-  - under the terms of either the GPL or the LGPL, and not to allow others to
-  - use your version of this file under the terms of the MPL, indicate your
-  - decision by deleting the provisions above and replace them with the notice
-  - and other provisions required by the GPL or the LGPL. If you do not delete
-  - the provisions above, a recipient may use your version of this file under
-  - the terms of any one of the MPL, the GPL or the LGPL.
-  - 
-  - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://ubufox/skin/overlay.css" type="text/css"?>
-<!DOCTYPE overlay SYSTEM "chrome://ubufox/locale/ubufox.dtd">
-<overlay id="ubufox-overlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="overlay.js"/>
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="ubufox-strings" src="chrome://ubufox/locale/ubufox.properties"/>
-  </stringbundleset>
-
-  <hbox id="searchPanel">
-    <label id="getUbuntu3" getMoreURL="http://www.google.com" class="text-link" 
-           onclick="return startUbuntuAddonsWizard(event);"
-           onload="ubufoxCheckExecutable();"
-           value="&ubufox.getubuntuextension;" />
-  </hbox>
-</overlay>

=== modified file 'content/updateRestart.js'
--- content/updateRestart.js	2009-09-15 10:02:38 +0000
+++ content/updateRestart.js	2010-11-10 15:13:41 +0000
@@ -78,23 +78,20 @@
 function checkUpdate()
 {
   var resReqFile = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
-  var versionString = null;
-  try {
-    versionString = Components.classes["@mozilla.org/fuel/application;1"].getService(Components.interfaces.extIApplication).version;
-  } catch (e) {
-  }
-  if (versionString != null && String_startsWith (versionString, "3.0"))
-    resReqFile.initWithPath("/var/lib/update-notifier/user.d/firefox-3.0-restart-required");
-  else if (versionString != null && String_startsWith (versionString, "3.5"))
-    resReqFile.initWithPath("/var/lib/update-notifier/user.d/firefox-3.5-restart-required");
-  else if (versionString != null && String_startsWith (versionString, "3.6"))
-    resReqFile.initWithPath("/var/lib/update-notifier/user.d/firefox-3.6-restart-required");
-  else if (versionString != null && String_startsWith (versionString, "3.7"))
-    resReqFile.initWithPath("/var/lib/update-notifier/user.d/firefox-3.7-restart-required");
-  else { // not supported version - skip restart notification
+  var launcher = Components.classes["@mozilla.org/process/environment;1"].getService(Components.interfaces.nsIEnvironment).get("MOZ_APP_LAUNCHER");
+  if(launcher == null) {
     return;
   }
 
+  try {
+    // If the launcher is a full path, just get the basename
+    resReqFile.initWithPath(launcher);
+    launcher = resReqFile.leafName;
+  } catch (e) { // initWithPath will throw if the path is relative
+  }
+
+  resReqFile.initWithPath("/var/run/" + launcher + "-restart-required");
+
   if(resReqFile.exists())
   {
     var dateResReq = resReqFile.lastModifiedTime;

=== modified file 'defaults/preferences/ubufox-pfs.js'
--- defaults/preferences/ubufox-pfs.js	2010-02-17 19:14:31 +0000
+++ defaults/preferences/ubufox-pfs.js	2010-11-10 15:13:41 +0000
@@ -1,5 +1,5 @@
 
 // use ubuntu plugin finder service
-pref ("pfs.datasource.url", "https://mozilla-pfs.ubuntu.com/plugin-finder?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&distributionID=10.04");
+pref ("pfs.datasource.url", "https://mozilla-pfs.ubuntu.com/plugin-finder?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&distributionID=%DIST_ID%");
 pref ("pfs.filehint.url", "https://mozilla-pfs.ubuntu.com/plugin-finder?op=filehint2name&distributionID=10.04");
 

=== modified file 'install.rdf'
--- install.rdf	2010-04-09 13:28:06 +0000
+++ install.rdf	2010-11-10 15:13:41 +0000
@@ -3,6 +3,7 @@
  xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>[e-mail]</em:id>
+    <em:unpack>true</em:unpack>
     <em:name>Ubuntu Firefox Modifications</em:name>
     <em:version>0.9rc2</em:version>
     <em:creator>Canonical Ltd.</em:creator>
@@ -16,8 +17,8 @@
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- firefox -->
-        <em:minVersion>1.5</em:minVersion>
-        <em:maxVersion>3.7.*</em:maxVersion>
+        <em:minVersion>4.0b6</em:minVersion>
+        <em:maxVersion>4.0b8pre</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>

=== modified file 'locale/af-ZA/ubufox.properties'
--- locale/af-ZA/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/af-ZA/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Ubuntu Firefox Pak
 ubufox.pluginWizard.availablePluginsPage.description.label=Kies bykomstighede vir media tipe
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/ar/ubufox.properties'
--- locale/ar/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/ar/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=حزمة فايرفوكس من أوبونتو.
 ubufox.pluginWizard.availablePluginsPage.description.label=اختر ملحقة لنوع الوسائط
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/bg/ubufox.properties'
--- locale/bg/ubufox.properties	2010-02-21 13:39:27 +0000
+++ locale/bg/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Ubuntu Firefox Pack.
 ubufox.pluginWizard.availablePluginsPage.description.label=Избор на приставка за тип медия
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/ca/ubufox.properties'
--- locale/ca/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/ca/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Paquet del Firefox de l'Ubuntu.
 ubufox.pluginWizard.availablePluginsPage.description.label=Trieu un connector per al tipus multimèdia
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/cs-CZ/ubufox.properties'
--- locale/cs-CZ/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/cs-CZ/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Ubuntu rozšíření pro Firefox.
 ubufox.pluginWizard.availablePluginsPage.description.label=Zvolte zásuvný modul pro daný typ média
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/de-DE/ubufox.properties'
--- locale/de-DE/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/de-DE/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -3,7 +3,7 @@
 [e-mail]=Ubuntu Firefox Paket.
 ubufox.pluginWizard.availablePluginsPage.description.label=Wähle ein plugin für Medien Typ
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/el-GR/ubufox.properties'
--- locale/el-GR/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/el-GR/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Πακέτο του Ubuntu για το Firefox.
 ubufox.pluginWizard.availablePluginsPage.description.label=Επιλέξτε ένα πρόσθετο για τη μορφή του πολυμέσου
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/en-US/ubufox.properties'
--- locale/en-US/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/en-US/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Ubuntu Firefox Pack.
 ubufox.pluginWizard.availablePluginsPage.description.label=Choose a plugin for media type
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/es/ubufox.properties'
--- locale/es/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/es/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Paquete de Ubuntu para Firefox.
 ubufox.pluginWizard.availablePluginsPage.description.label=Seleccione un complemento para el tipo de medio
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/eu/ubufox.properties'
--- locale/eu/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/eu/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -5,7 +5,7 @@
 ubufox.pluginWizard.availablePluginsPage.description.label=Multimedia mota horrentzako plugina hautatu
 
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/fi-FI/ubufox.properties'
--- locale/fi-FI/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/fi-FI/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Ubuntun Firefox-paketti
 ubufox.pluginWizard.availablePluginsPage.description.label=Valitse mediatyypille sopiva liit\u00e4nn\u00e4inen
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/fr/ubufox.properties'
--- locale/fr/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/fr/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Paquet Firefox Pour Ubuntu.
 ubufox.pluginWizard.availablePluginsPage.description.label=Sélectionnez un plugin pour le type de média
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/gl-ES/ubufox.properties'
--- locale/gl-ES/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/gl-ES/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Paquete de Ubuntu para Firefox.
 ubufox.pluginWizard.availablePluginsPage.description.label=Escoller un plugin para o tipo de contido
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/hu-HU/ubufox.properties'
--- locale/hu-HU/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/hu-HU/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Ubuntu Firefox csomag
 ubufox.pluginWizard.availablePluginsPage.description.label=Válasszon egy bővítményt a médiatípushoz
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/it-IT/ubufox.properties'
--- locale/it-IT/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/it-IT/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Pacchetto Firefox Ubuntu.
 ubufox.pluginWizard.availablePluginsPage.description.label=Scegliere un plugin per il tipo di media
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/ja/ubufox.properties'
--- locale/ja/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/ja/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Ubuntu Firefox Pack.
 ubufox.pluginWizard.availablePluginsPage.description.label=メディアの種類でプラグインを選択する
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/lt-LT/ubufox.properties'
--- locale/lt-LT/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/lt-LT/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Ubuntu Firefox paketas
 ubufox.pluginWizard.availablePluginsPage.description.label=Pasirinkite įskiepį failo tipui
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/nl-NL/ubufox.properties'
--- locale/nl-NL/ubufox.properties	2010-02-17 10:49:28 +0000
+++ locale/nl-NL/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Ubuntu Firefox-pakket.
 ubufox.pluginWizard.availablePluginsPage.description.label=Kies een plug-in voor het mediatype
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/locales/index-nl.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/locales/index-nl.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/pl-PL/ubufox.properties'
--- locale/pl-PL/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/pl-PL/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Pakiet Ubuntu Firefox.
 ubufox.pluginWizard.availablePluginsPage.description.label=Wybór wtyczki dla typu pliku
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/pt-BR/ubufox.properties'
--- locale/pt-BR/ubufox.properties	2010-04-17 00:39:37 +0000
+++ locale/pt-BR/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Pacote para o Firefox do Ubuntu
 ubufox.pluginWizard.availablePluginsPage.description.label=Escolha um plug-in para o tipo de mídia
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/ro/ubufox.properties'
--- locale/ro/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/ro/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Pachetul Ubuntu Firefox.
 ubufox.pluginWizard.availablePluginsPage.description.label=Alegeți un modul pentru acest tip media
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/ru-RU/ubufox.properties'
--- locale/ru-RU/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/ru-RU/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Расширения Firefox для Ubuntu
 ubufox.pluginWizard.availablePluginsPage.description.label=Выберите плагин для типа содержимого
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/sl-SI/ubufox.properties'
--- locale/sl-SI/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/sl-SI/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Ubuntu razširitve za Firefox.
 ubufox.pluginWizard.availablePluginsPage.description.label=Izberite vtičnik za vrsto datoteke
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/sv-SE/ubufox.properties'
--- locale/sv-SE/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/sv-SE/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Ubuntu-paket för Firefox.
 ubufox.pluginWizard.availablePluginsPage.description.label=Välj ett instick för mediatypen
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/uk/ubufox.properties'
--- locale/uk/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/uk/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Убунтівські доповнення до Firefox.
 ubufox.pluginWizard.availablePluginsPage.description.label=Оберіть модуль для цього типу файлів
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== modified file 'locale/zh-CN/ubufox.properties'
--- locale/zh-CN/ubufox.properties	2010-02-17 19:10:59 +0000
+++ locale/zh-CN/ubufox.properties	2010-11-10 15:13:41 +0000
@@ -4,7 +4,7 @@
 [e-mail]=Ubuntu 火狐扩展包.
 ubufox.pluginWizard.availablePluginsPage.description.label=选择打开媒体的插件
 app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
-browser.startup.homepage=about:home
+browser.startup.homepage=about:startpage
 browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
 app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
 startup.homepage_override_url=about:blank

=== added file 'pfs/db/sources.list.10.10'
--- pfs/db/sources.list.10.10	1970-01-01 00:00:00 +0000
+++ pfs/db/sources.list.10.10	2010-11-10 15:13:41 +0000
@@ -0,0 +1,2 @@
+deb http://archive.ubuntu.com/ubuntu/ maverick main restricted universe multiverse
+

=== added file 'pfs/db/sources.list.11.04'
--- pfs/db/sources.list.11.04	1970-01-01 00:00:00 +0000
+++ pfs/db/sources.list.11.04	2010-11-10 15:13:41 +0000
@@ -0,0 +1,2 @@
+deb http://archive.ubuntu.com/ubuntu/ natty main restricted universe multiverse
+