Bug 1588867 - Remove support for the carbon plugin api in SeaMonkey. r=IanN
Port Bug 850925 "Remove front-end UI for unused npapi-carbon-event-model-failure plugin error".
This commit is contained in:
Frank-Rainer Grahl
Родитель
6ac913c27e
Коммит
5703475913
|
|
@ -763,7 +763,6 @@ pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.
|
|||
pref("plugins.update.url", "https://www.mozilla.org/%LOCALE%/plugincheck/");
|
||||
pref("plugins.update.notifyUser", false);
|
||||
pref("plugins.hide_infobar_for_outdated_plugin", false);
|
||||
pref("plugins.hide_infobar_for_carbon_failure_plugin", false);
|
||||
pref("plugins.hide_infobar_for_missing_plugin", false);
|
||||
pref("plugins.click_to_play", true);
|
||||
pref("plugin.disable", false);
|
||||
|
|
|
|||
|
|
@ -476,15 +476,6 @@
|
|||
this.removeNotification(outdatedNotification);
|
||||
}
|
||||
|
||||
if (aData == "plugins.hide_infobar_for_carbon_failure_plugin") {
|
||||
if (!Services.prefs.getBoolPref(aData))
|
||||
return;
|
||||
|
||||
var carbonfailureNotification = this.getNotificationWithValue("carbon-failure-plugins");
|
||||
if (carbonfailureNotification)
|
||||
this.removeNotification(carbonfailureNotification);
|
||||
}
|
||||
|
||||
if (aData == "plugins.hide_infobar_for_missing_plugin") {
|
||||
if (!Services.prefs.getBoolPref(aData))
|
||||
return;
|
||||
|
|
@ -607,7 +598,6 @@
|
|||
"blocked-plugins",
|
||||
"disabled-plugins",
|
||||
"missing-plugins",
|
||||
"carbon-failure-plugins",
|
||||
"outdated-plugins",
|
||||
];
|
||||
|
||||
|
|
@ -1898,7 +1888,6 @@
|
|||
Services.obs.addObserver(this, "formsubmit");
|
||||
|
||||
Services.prefs.addObserver("plugins.hide_infobar_for_outdated_plugin", this);
|
||||
Services.prefs.addObserver("plugins.hide_infobar_for_carbon_failure_plugin", this);
|
||||
Services.prefs.addObserver("plugins.hide_infobar_for_missing_plugin", this);
|
||||
Services.prefs.addObserver("privacy.popups.showBrowserMessage", this);
|
||||
Services.prefs.addObserver("dom.disable_open_during_load", this);
|
||||
|
|
@ -1970,9 +1959,6 @@
|
|||
try {
|
||||
Services.prefs.removeObserver("plugins.hide_infobar_for_outdated_plugin", this);
|
||||
} catch (ex) {}
|
||||
try {
|
||||
Services.prefs.removeObserver("plugins.hide_infobar_for_carbon_failure_plugin", this);
|
||||
} catch (ex) {}
|
||||
try {
|
||||
Services.prefs.removeObserver("plugins.hide_infobar_for_missing_plugin", this);
|
||||
} catch (ex) {}
|
||||
|
|
@ -2276,55 +2262,6 @@
|
|||
]]>
|
||||
</handler>
|
||||
|
||||
<handler event="npapi-carbon-event-model-failure" phase="capturing">
|
||||
<![CDATA[
|
||||
var plugin = event.target;
|
||||
// Force a style flush, so that we ensure our binding is attached.
|
||||
plugin.clientTop;
|
||||
|
||||
function callback() {
|
||||
// Notify all windows that an application quit has been requested.
|
||||
var cancelQuit = Cc["@mozilla.org/supports-PRBool;1"]
|
||||
.createInstance(Ci.nsISupportsPRBool);
|
||||
Services.obs.notifyObservers(cancelQuit,
|
||||
"quit-application-requested");
|
||||
|
||||
// Something aborted the quit process.
|
||||
if (cancelQuit.data)
|
||||
return;
|
||||
|
||||
var nsIAppStartup = Ci.nsIAppStartup;
|
||||
Cc["@mozilla.org/toolkit/app-startup;1"]
|
||||
.getService(nsIAppStartup)
|
||||
.quit(nsIAppStartup.eAttemptQuit |
|
||||
nsIAppStartup.eRestart |
|
||||
nsIAppStartup.eRestarti386);
|
||||
}
|
||||
|
||||
var notification = "carbon-failure-plugins";
|
||||
var pref = "plugins.hide_infobar_for_carbon_failure_plugin";
|
||||
if ("@mozilla.org/xpcom/mac-utils;1" in Cc &&
|
||||
!Cc["@mozilla.org/xpcom/mac-utils;1"]
|
||||
.getService(Ci.nsIMacUtils)
|
||||
.isUniversalBinary) {
|
||||
pref = null;
|
||||
notification = "missing-plugins";
|
||||
callback = this.openURLPref.bind(this, "plugins.update.url");
|
||||
}
|
||||
|
||||
var prefix = notification.replace(/-/g, "");
|
||||
var message = this._stringBundle.GetStringFromName(prefix + "Message.title");
|
||||
var buttons = [{
|
||||
label: this._stringBundle.GetStringFromName(prefix + "Message.button.label"),
|
||||
accessKey: this._stringBundle.GetStringFromName(prefix + "Message.button.accesskey"),
|
||||
popup: null,
|
||||
callback: callback
|
||||
}];
|
||||
|
||||
this.pluginUnavailable(plugin, notification, message, buttons, pref);
|
||||
]]>
|
||||
</handler>
|
||||
|
||||
<handler event="MozApplicationManifest" phase="capturing">
|
||||
<![CDATA[
|
||||
if (!Services.prefs.getBoolPref("browser.offline-apps.notify"))
|
||||
|
|
|
|||
|
|
@ -6,15 +6,6 @@ outdatedpluginsMessage.title=Some plugins used by this page are out of date.
|
|||
outdatedpluginsMessage.button.label=Update Plugins…
|
||||
outdatedpluginsMessage.button.accesskey=U
|
||||
|
||||
# LOCALIZATION NOTE (carbonfailurepluginsMessage.title):
|
||||
# The English form of this string used to use the word "requires" but it was
|
||||
# later thought that this word felt too aggressive and we now use "requests".
|
||||
# Localizers can use use a word corresponding to "requests" or "requires"
|
||||
# or both, depending on what matches the language best.
|
||||
carbonfailurepluginsMessage.title=This page requests a plugin that can only run in 32-bit mode.
|
||||
carbonfailurepluginsMessage.button.label=Restart in 32-bit mode
|
||||
carbonfailurepluginsMessage.button.accesskey=R
|
||||
|
||||
missingpluginsMessage.title=Additional plugins are required to display all the media on this page.
|
||||
missingpluginsMessage.button.label=Preferences
|
||||
missingpluginsMessage.button.accesskey=P
|
||||
|
|
|
|||
|
|
@ -161,7 +161,6 @@ treecols:-moz-lwtheme {
|
|||
}
|
||||
|
||||
.messageImage[value="blocked-plugins"],
|
||||
.messageImage[value="carbon-failure-plugins"],
|
||||
.messageImage[value="disabled-plugins"],
|
||||
.messageImage[value="missing-plugins"],
|
||||
.messageImage[value="outdated-plugins"],
|
||||
|
|
|
|||
|
|
@ -175,7 +175,6 @@ treecols:-moz-lwtheme {
|
|||
}
|
||||
|
||||
.messageImage[value="blocked-plugins"],
|
||||
.messageImage[value="carbon-failure-plugins"],
|
||||
.messageImage[value="disabled-plugins"],
|
||||
.messageImage[value="missing-plugins"],
|
||||
.messageImage[value="outdated-plugins"],
|
||||
|
|
|
|||
|
|
@ -171,7 +171,6 @@ treecols:-moz-lwtheme {
|
|||
}
|
||||
|
||||
.messageImage[value="blocked-plugins"],
|
||||
.messageImage[value="carbon-failure-plugins"],
|
||||
.messageImage[value="disabled-plugins"],
|
||||
.messageImage[value="missing-plugins"],
|
||||
.messageImage[value="outdated-plugins"],
|
||||
|
|
|
|||
|
|
@ -123,7 +123,6 @@ toolbar[iconsize="small"] > #print-button[disabled="true"] {
|
|||
}
|
||||
|
||||
.messageImage[value="blocked-plugins"],
|
||||
.messageImage[value="carbon-failure-plugins"],
|
||||
.messageImage[value="disabled-plugins"],
|
||||
.messageImage[value="missing-plugins"],
|
||||
.messageImage[value="outdated-plugins"],
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче