Merge lp:~micahg/firefox/firefox-3.6-20091008 into lp:firefox/3.6

[Micah Gersten]

[Micah Gersten (micahg)]

Compiled in my ppa

[Alexander Sack (asac)]

also merged. thx a lot!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-09-16 05:57:54 +0000
+++ debian/changelog	2009-10-09 06:35:19 +0000
@@ -1,4 +1,4 @@
-firefox-3.6 (3.6~a2~hg20090915r31768+nobinonly-0ubuntu1) UNRELEASED; urgency=low
+firefox-3.6 (3.6~b1~hg20091008r32386+nobinonly-0ubuntu1) UNRELEASED; urgency=low
 
   [ H. Montoliu <[e-mail]> ]
   * fix LP: #361052 - firefox apport hook fails to retrieve pluginreg.dat file
@@ -136,7 +136,7 @@
     - update debian/patches/browser_branding.patch
     - update debian/patches/bzXXX_moz_app_name_inconsistencies.patch
 
- -- Micah Gersten <[e-mail]>  Wed, 16 Sep 2009 00:43:11 -0500
+ -- Micah Gersten <[e-mail]>  Thu, 08 Oct 2009 23:40:03 -0500
 
 firefox-3.1 (3.1~b3~hg20081221r22451+nobinonly-0ubuntu1) UNRELEASED; urgency=low
 

=== modified file 'debian/patches/bz460917_att350845_reload_new_plugins.patch'
--- debian/patches/bz460917_att350845_reload_new_plugins.patch	2008-12-22 11:55:22 +0000
+++ debian/patches/bz460917_att350845_reload_new_plugins.patch	2009-10-09 06:35:19 +0000
@@ -6,7 +6,7 @@
 ===================================================================
 --- mozilla.orig/browser/base/content/browser.js
 +++ mozilla/browser/base/content/browser.js
-@@ -5780,22 +5780,30 @@
+@@ -5900,22 +5900,30 @@
  }
  
  missingPluginInstaller.prototype.installSinglePlugin = function(aEvent){
@@ -37,7 +37,35 @@
    aEvent.stopPropagation();
  }
  
-@@ -5897,37 +5905,50 @@
+@@ -5981,21 +5989,27 @@
+     var url = formatter.formatURLPref("plugins.update.url");
+     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) {
+       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);
+   }
+ 
+   if (aEvent.type == "PluginBlocklisted") {
+     if (blockedNotification || missingNotification)
+       return;
+ 
+     let iconURL = "chrome://mozapps/skin/plugins/pluginBlocked-16.png";
+     let messageString = gNavigatorBundle.getString("blockedpluginsMessage.title");
+@@ -6074,16 +6088,23 @@
  
    // clear the plugin list, now that at least one plugin has been installed
    browser.missingPlugins = null;
@@ -56,35 +84,8 @@
    browser.reload();
  }
  
- function blocklistInfo()
- {
-   var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
-                             .getService(Components.interfaces.nsIURLFormatter);
-   var url = formatter.formatURLPref("extensions.blocklist.detailsURL");
-   gBrowser.loadOneTab(url, null, null, null, false, false);
-   return true;
- }
- 
- function pluginsMissing()
- {
-   // get the urls of missing plugins
-   var missingPluginsArray = gBrowser.selectedBrowser.missingPlugins;
-+  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);
- }
- 
  var gMissingPluginInstaller = new missingPluginInstaller();
  
  function convertFromUnicode(charset, str)
  {
    try {
-     var unicodeConverter = Components