Merge lp:~micahg/firefox/firefox-3.7-20091008 into lp:~mozillateam/firefox/firefox-4.0.head.branch_format7

[Micah Gersten]

[Micah Gersten (micahg)]

Compiled in my ppa

[Alexander Sack (asac)]

merged. thx

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-07 22:54:16 +0000
+++ debian/changelog	2009-10-09 06:00:25 +0000
@@ -1,11 +1,12 @@
-firefox-3.7 (3.7~a1~hg20091007r33630+nobinonly-0ubuntu1) UNRELEASED; urgency=low
+firefox-3.7 (3.7~a1~hg20091008r33669+nobinonly-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Fabien Tassin ]
   * Mass update from 3.6 to 3.7
   * Drop libnkgnomevfs.so from firefox-3.7-gnome-support, it's already
     shippped in xulrunner-1.9.3-gnome-support (see bmo #512671)
     - update debian/firefox-3.7-gnome-support.install
 
- -- Fabien Tassin <[e-mail]>  Wed, 07 Oct 2009 17:33:45 +0200
+ -- Micah Gersten <[e-mail]>  Thu, 08 Oct 2009 23:33:42 -0500
 
 firefox-3.6 (3.6~a2~hg20090810r31291+nobinonly-0ubuntu1) UNRELEASED; urgency=low
 

=== modified file 'debian/patches/bz460917_att350845_reload_new_plugins.patch'
--- debian/patches/bz460917_att350845_reload_new_plugins.patch	2009-10-07 00:49:34 +0000
+++ debian/patches/bz460917_att350845_reload_new_plugins.patch	2009-10-09 06:00:25 +0000
@@ -6,86 +6,86 @@
 ===================================================================
 --- mozilla.orig/browser/base/content/browser.js
 +++ mozilla/browser/base/content/browser.js
-@@ -5892,22 +5892,30 @@
- }
- 
- missingPluginInstaller.prototype.installSinglePlugin = function(aEvent){
-   var missingPluginsArray = {};
- 
-   var pluginInfo = getPluginInfo(aEvent.target);
-   missingPluginsArray[pluginInfo.mimetype] = pluginInfo;
- 
-+  gBrowser.selectedBrowser.addEventListener("NewPluginInstalled",
-+                                            gMissingPluginInstaller.refreshBrowser,
-+                                            false);
-+
-   if (missingPluginsArray) {
-     window.openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
-                       "PFSWindow", "chrome,centerscreen,resizable=yes",
-                       {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser});
-   }
- 
-+  gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled",
-+                                               gMissingPluginInstaller.refreshBrowser,
-+                                               false);
-+
-   aEvent.stopPropagation();
- }
- 
- missingPluginInstaller.prototype.managePlugins = function(aEvent){
-   BrowserOpenAddonsMgr("plugins");
-   aEvent.stopPropagation();
- }
- 
-@@ -5967,21 +5975,27 @@
-     var url = formatURL("plugins.update.url", true);
-     gBrowser.loadOneTab(url, {inBackground: false});
-     return true;
-   }
- 
-   function showPluginsMissing() {
-     // get the urls of missing plugins
-     var missingPluginsArray = gBrowser.selectedBrowser.missingPlugins;
+@@ -5864,22 +5864,30 @@
+ var gMissingPluginInstaller = {
+ 
+   installSinglePlugin: function (aEvent) {
+     var missingPluginsArray = {};
+ 
+     var pluginInfo = getPluginInfo(aEvent.target);
+     missingPluginsArray[pluginInfo.mimetype] = pluginInfo;
+ 
 +    gBrowser.selectedBrowser.addEventListener("NewPluginInstalled",
 +                                              gMissingPluginInstaller.refreshBrowser,
 +                                              false);
++
      if (missingPluginsArray) {
-       window.openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
-                         "PFSWindow", "chrome,centerscreen,resizable=yes",
-                         {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser});
+       openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
+                  "PFSWindow", "chrome,centerscreen,resizable=yes",
+                  {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser});
      }
+ 
 +    gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled",
 +                                                 gMissingPluginInstaller.refreshBrowser,
 +                                                 false);
-   }
- 
-   if (aEvent.type == "PluginBlocklisted") {
-     if (blockedNotification || missingNotification)
-       return;
- 
-     let iconURL = "chrome://mozapps/skin/plugins/pluginBlocked-16.png";
-     let messageString = gNavigatorBundle.getString("blockedpluginsMessage.title");
-@@ -6060,16 +6074,23 @@
- 
-   // clear the plugin list, now that at least one plugin has been installed
-   browser.missingPlugins = null;
-   if (notification) {
-     // reset UI
-     notificationBox.removeNotification(notification);
-   }
-   // reload the browser to make the new plugin show.
-+
-+  // reload plugins
-+  var pm = Components.classes["@mozilla.org/plugin/manager;1"]
-+               .getService(Components.interfaces.nsIPluginManager);
-+  pm.reloadPlugins(false);
-+
-+  // ... and reload the browser to activate new plugins available
-   browser.reload();
- }
- 
- var gMissingPluginInstaller = new missingPluginInstaller();
++
+     aEvent.stopPropagation();
+   },
+ 
+   managePlugins: function (aEvent) {
+     BrowserOpenAddonsMgr("plugins");
+     aEvent.stopPropagation();
+   },
+ 
+@@ -5939,21 +5947,27 @@
+       var url = formatURL("plugins.update.url", true);
+       gBrowser.loadOneTab(url, {inBackground: false});
+       return true;
+     }
+ 
+     function showPluginsMissing() {
+       // get the urls of missing plugins
+       var missingPluginsArray = gBrowser.selectedBrowser.missingPlugins;
++      gBrowser.selectedBrowser.addEventListener("NewPluginInstalled",
++                                                gMissingPluginInstaller.refreshBrowser,
++                                                false);
+       if (missingPluginsArray) {
+         openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
+                    "PFSWindow", "chrome,centerscreen,resizable=yes",
+                    {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser});
+       }
++      gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled",
++                                                   gMissingPluginInstaller.refreshBrowser,
++                                                   false);
+     }
+ 
+     if (aEvent.type == "PluginBlocklisted") {
+       if (blockedNotification || missingNotification)
+         return;
+ 
+       let iconURL = "chrome://mozapps/skin/plugins/pluginBlocked-16.png";
+       let messageString = gNavigatorBundle.getString("blockedpluginsMessage.title");
+@@ -6032,16 +6046,23 @@
+ 
+     // clear the plugin list, now that at least one plugin has been installed
+     browser.missingPlugins = null;
+     if (notification) {
+       // reset UI
+       notificationBox.removeNotification(notification);
+     }
+     // reload the browser to make the new plugin show.
++
++    // reload plugins
++    var pm = Components.classes["@mozilla.org/plugin/manager;1"]
++                 .getService(Components.interfaces.nsIPluginManager);
++    pm.reloadPlugins(false);
++  
++    // ... and reload the browser to activate new plugins available
+     browser.reload();
+   }
+ };
  
  function convertFromUnicode(charset, str)
  {
    try {
+     var unicodeConverter = Components