Mozilla Firefox

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

  1. firefox-3.7-20091008
  2. Merge into firefox-4.0.head.branch_fo...
Proposed by Micah Gersten
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~micahg/firefox/firefox-3.7-20091008
Merge into: lp://qastaging/~mozillateam/firefox/firefox-4.0.head.branch_format7
Diff against target: 180 lines
2 files modified
debian/changelog (+3/-2)
debian/patches/bz460917_att350845_reload_new_plugins.patch (+71/-71)
To merge this branch: bzr merge lp://qastaging/~micahg/firefox/firefox-3.7-20091008
Reviewer Review Type Date Requested Status
Alexander Sack (community) Approve
Review via email: mp+13106@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Micah Gersten (micahg) wrote :

Compiled in my ppa

Revision history for this message
Alexander Sack (asac) wrote :

merged. thx

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1firefox-3.7 (3.7~a1~hg20091007r33630+nobinonly-0ubuntu1) UNRELEASED; urgency=low1firefox-3.7 (3.7~a1~hg20091008r33669+nobinonly-0ubuntu1) UNRELEASED; urgency=low
22
3 [ Fabien Tassin ]
3 * Mass update from 3.6 to 3.74 * Mass update from 3.6 to 3.7
4 * Drop libnkgnomevfs.so from firefox-3.7-gnome-support, it's already5 * Drop libnkgnomevfs.so from firefox-3.7-gnome-support, it's already
5 shippped in xulrunner-1.9.3-gnome-support (see bmo #512671)6 shippped in xulrunner-1.9.3-gnome-support (see bmo #512671)
6 - update debian/firefox-3.7-gnome-support.install7 - update debian/firefox-3.7-gnome-support.install
78
8 -- Fabien Tassin <fta@ubuntu.com> Wed, 07 Oct 2009 17:33:45 +02009 -- Micah Gersten <launchpad@micahscomputing.com> Thu, 08 Oct 2009 23:33:42 -0500
910
10firefox-3.6 (3.6~a2~hg20090810r31291+nobinonly-0ubuntu1) UNRELEASED; urgency=low11firefox-3.6 (3.6~a2~hg20090810r31291+nobinonly-0ubuntu1) UNRELEASED; urgency=low
1112
1213
=== 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 @@
6===================================================================6===================================================================
7--- mozilla.orig/browser/base/content/browser.js7--- mozilla.orig/browser/base/content/browser.js
8+++ mozilla/browser/base/content/browser.js8+++ mozilla/browser/base/content/browser.js
9@@ -5892,22 +5892,30 @@9@@ -5864,22 +5864,30 @@
10 }10 var gMissingPluginInstaller = {
11 11
12 missingPluginInstaller.prototype.installSinglePlugin = function(aEvent){12 installSinglePlugin: function (aEvent) {
13 var missingPluginsArray = {};13 var missingPluginsArray = {};
14 14
15 var pluginInfo = getPluginInfo(aEvent.target);15 var pluginInfo = getPluginInfo(aEvent.target);
16 missingPluginsArray[pluginInfo.mimetype] = pluginInfo;16 missingPluginsArray[pluginInfo.mimetype] = pluginInfo;
17 17
18+ gBrowser.selectedBrowser.addEventListener("NewPluginInstalled",
19+ gMissingPluginInstaller.refreshBrowser,
20+ false);
21+
22 if (missingPluginsArray) {
23 window.openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
24 "PFSWindow", "chrome,centerscreen,resizable=yes",
25 {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser});
26 }
27
28+ gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled",
29+ gMissingPluginInstaller.refreshBrowser,
30+ false);
31+
32 aEvent.stopPropagation();
33 }
34
35 missingPluginInstaller.prototype.managePlugins = function(aEvent){
36 BrowserOpenAddonsMgr("plugins");
37 aEvent.stopPropagation();
38 }
39
40@@ -5967,21 +5975,27 @@
41 var url = formatURL("plugins.update.url", true);
42 gBrowser.loadOneTab(url, {inBackground: false});
43 return true;
44 }
45
46 function showPluginsMissing() {
47 // get the urls of missing plugins
48 var missingPluginsArray = gBrowser.selectedBrowser.missingPlugins;
49+ gBrowser.selectedBrowser.addEventListener("NewPluginInstalled",18+ gBrowser.selectedBrowser.addEventListener("NewPluginInstalled",
50+ gMissingPluginInstaller.refreshBrowser,19+ gMissingPluginInstaller.refreshBrowser,
51+ false);20+ false);
21+
52 if (missingPluginsArray) {22 if (missingPluginsArray) {
53 window.openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",23 openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
54 "PFSWindow", "chrome,centerscreen,resizable=yes",24 "PFSWindow", "chrome,centerscreen,resizable=yes",
55 {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser});25 {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser});
56 }26 }
27
57+ gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled",28+ gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled",
58+ gMissingPluginInstaller.refreshBrowser,29+ gMissingPluginInstaller.refreshBrowser,
59+ false);30+ false);
60 }31+
61 32 aEvent.stopPropagation();
62 if (aEvent.type == "PluginBlocklisted") {33 },
63 if (blockedNotification || missingNotification)34
64 return;35 managePlugins: function (aEvent) {
65 36 BrowserOpenAddonsMgr("plugins");
66 let iconURL = "chrome://mozapps/skin/plugins/pluginBlocked-16.png";37 aEvent.stopPropagation();
67 let messageString = gNavigatorBundle.getString("blockedpluginsMessage.title");38 },
68@@ -6060,16 +6074,23 @@39
69 40@@ -5939,21 +5947,27 @@
70 // clear the plugin list, now that at least one plugin has been installed41 var url = formatURL("plugins.update.url", true);
71 browser.missingPlugins = null;42 gBrowser.loadOneTab(url, {inBackground: false});
72 if (notification) {43 return true;
73 // reset UI44 }
74 notificationBox.removeNotification(notification);45
75 }46 function showPluginsMissing() {
76 // reload the browser to make the new plugin show.47 // get the urls of missing plugins
77+48 var missingPluginsArray = gBrowser.selectedBrowser.missingPlugins;
78+ // reload plugins49+ gBrowser.selectedBrowser.addEventListener("NewPluginInstalled",
79+ var pm = Components.classes["@mozilla.org/plugin/manager;1"]50+ gMissingPluginInstaller.refreshBrowser,
80+ .getService(Components.interfaces.nsIPluginManager);51+ false);
81+ pm.reloadPlugins(false);52 if (missingPluginsArray) {
82+53 openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
83+ // ... and reload the browser to activate new plugins available54 "PFSWindow", "chrome,centerscreen,resizable=yes",
84 browser.reload();55 {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser});
85 }56 }
86 57+ gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled",
87 var gMissingPluginInstaller = new missingPluginInstaller();58+ gMissingPluginInstaller.refreshBrowser,
59+ false);
60 }
61
62 if (aEvent.type == "PluginBlocklisted") {
63 if (blockedNotification || missingNotification)
64 return;
65
66 let iconURL = "chrome://mozapps/skin/plugins/pluginBlocked-16.png";
67 let messageString = gNavigatorBundle.getString("blockedpluginsMessage.title");
68@@ -6032,16 +6046,23 @@
69
70 // clear the plugin list, now that at least one plugin has been installed
71 browser.missingPlugins = null;
72 if (notification) {
73 // reset UI
74 notificationBox.removeNotification(notification);
75 }
76 // reload the browser to make the new plugin show.
77+
78+ // reload plugins
79+ var pm = Components.classes["@mozilla.org/plugin/manager;1"]
80+ .getService(Components.interfaces.nsIPluginManager);
81+ pm.reloadPlugins(false);
82+
83+ // ... and reload the browser to activate new plugins available
84 browser.reload();
85 }
86 };
88 87
89 function convertFromUnicode(charset, str)88 function convertFromUnicode(charset, str)
90 {89 {
91 try {90 try {
91 var unicodeConverter = Components

Subscribers

People subscribed via source and target branches

to all changes: