Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/icecat/files: 137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch
Date: Thu, 24 Jun 2010 05:34:36
Message-Id: 20100624053432.A14DC2CF40@corvid.gentoo.org
1 polynomial-c 10/06/24 05:34:32
2
3 Added:
4 137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch
5 Log:
6 Security bump.
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 www-client/icecat/files/137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/files/137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/files/137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch?rev=1.1&content-type=text/plain
14
15 Index: 137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch
16 ===================================================================
17 This patch has been ported to 3.6.4, may not be entirely correct.
18
19 Original patch was from bmo 460917, att 350845
20
21 ---
22 --- browser/base/content/browser.js
23 +++ browser/base/content/browser.js
24 @@ -6009,9 +6009,18 @@
25 var pluginInfo = getPluginInfo(aEvent.target);
26 missingPluginsArray[pluginInfo.mimetype] = pluginInfo;
27
28 +
29 + gBrowser.selectedBrowser.addEventListener("NewPluginInstalled",
30 + gMissingPluginInstaller.refreshBrowser,
31 + false);
32 +
33 openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
34 "PFSWindow", "chrome,centerscreen,resizable=yes",
35 {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser});
36 +
37 + gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled",
38 + gMissingPluginInstaller.refreshBrowser,
39 + false);
40 },
41
42 // Callback for user clicking on a disabled plugin
43 @@ -6107,11 +6116,19 @@
44 function showPluginsMissing() {
45 // get the urls of missing plugins
46 var missingPluginsArray = gBrowser.selectedBrowser.missingPlugins;
47 +
48 + gBrowser.selectedBrowser.addEventListener("NewPluginInstalled",
49 + gMissingPluginInstaller.refreshBrowser,
50 + false);
51 +
52 if (missingPluginsArray) {
53 window.openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
54 "PFSWindow", "chrome,centerscreen,resizable=yes",
55 {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser});
56 }
57 + gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled",
58 + gMissingPluginInstaller.refreshBrowser,
59 + false);
60 }
61
62 if (aEvent.type == "PluginBlocklisted") {
63 @@ -6442,6 +6459,13 @@
64 notificationBox.removeNotification(notification);
65 }
66 // reload the browser to make the new plugin show.
67 +
68 + // reload plugins
69 + var pm = Components.classes["@mozilla.org/plugin/manager;1"]
70 + .getService(Components.interfaces.nsIPluginManager);
71 + pm.reloadPlugins(false);
72 +
73 + // ... and reload the browser to activate new plugins available
74 browser.reload();
75 }
76 };