From 8e19058f03be8ab51c5af4ba310adb4bd5b8b37e Mon Sep 17 00:00:00 2001 From: Frank-Rainer Grahl Date: Sat, 23 Jan 2021 20:32:05 +0100 Subject: [PATCH] Bug 1688415 - Remove preferences for NPAPI. r=IanN --- suite/app/profile/suite-prefs.js | 16 ++++----- .../src/nsThunderbirdProfileMigrator.cpp | 3 -- .../components/pref/content/pref-scripts.xul | 35 ------------------- .../en-US/chrome/common/pref/pref-scripts.dtd | 10 ------ .../chrome/mailnews/pref/mailPrefsOverlay.dtd | 4 --- .../prefs/content/mailPrefsOverlay.xul | 16 --------- suite/mailnews/jar.mn | 1 - 7 files changed, 6 insertions(+), 79 deletions(-) diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js index 38d8c4d24f..2abae786a4 100644 --- a/suite/app/profile/suite-prefs.js +++ b/suite/app/profile/suite-prefs.js @@ -783,10 +783,13 @@ pref("dom.identity.enabled", false); pref("dom.ipc.plugins.nativeCursorSupport", true); #endif -pref("plugins.hide_infobar_for_outdated_plugin", false); -pref("plugins.hide_infobar_for_missing_plugin", false); -pref("plugins.click_to_play", true); +pref("plugins.hide_infobar_for_outdated_plugin", true); +pref("plugins.hide_infobar_for_missing_plugin", true); +pref("plugins.click_to_play", false); pref("plugin.disable", false); +pref("plugin.default.state", 0); +pref("plugins.favorfallback.mode", "always"); +pref("plugins.favorfallback.rules", "nosrc,video"); // Digital Rights Management, Encrypted Media Extensions pref("media.eme.enabled", false); @@ -947,7 +950,6 @@ pref("services.sync.prefs.sync.mailnews.mark_message_read.auto", true); pref("services.sync.prefs.sync.mailnews.mark_message_read.delay", true); pref("services.sync.prefs.sync.mailnews.mark_message_read.delay.interval", true); pref("services.sync.prefs.sync.mailnews.messageid.openInNewWindow", true); -pref("services.sync.prefs.sync.mailnews.message_display.allow_plugins", true); pref("services.sync.prefs.sync.mailnews.message_display.disable_remote_image", true); pref("services.sync.prefs.sync.mailnews.nav_crosses_folders", true); pref("services.sync.prefs.sync.mailnews.offline_sync_mail", true); @@ -1035,12 +1037,6 @@ pref("security.sandbox.windows.log", false); // 3 - the strongest settings we seem to be able to use without breaking // everything, but will probably cause some functionality restrictions pref("dom.ipc.plugins.sandbox-level.default", 0); -#if defined(_AMD64_) -// The lines in PluginModuleParent.cpp should be changed in line with this. -pref("dom.ipc.plugins.sandbox-level.flash", 2); -#else -pref("dom.ipc.plugins.sandbox-level.flash", 0); -#endif #if defined(MOZ_CONTENT_SANDBOX) // This controls the strength of the Windows content process sandbox for testing diff --git a/suite/components/migration/src/nsThunderbirdProfileMigrator.cpp b/suite/components/migration/src/nsThunderbirdProfileMigrator.cpp index 7218a4e962..3f5365f12a 100644 --- a/suite/components/migration/src/nsThunderbirdProfileMigrator.cpp +++ b/suite/components/migration/src/nsThunderbirdProfileMigrator.cpp @@ -350,7 +350,6 @@ nsThunderbirdProfileMigrator::PrefTransform gTransforms[] = { MAKESAMETYPEPREFTRANSFORM("mailnews.mark_message_read.delay", Bool), MAKESAMETYPEPREFTRANSFORM("mailnews.mark_message_read.delay.interval", Int), - MAKESAMETYPEPREFTRANSFORM("mailnews.message_display.allow.plugins", Bool), MAKESAMETYPEPREFTRANSFORM("mailnews.message_display.disable_remote_image", Bool), MAKESAMETYPEPREFTRANSFORM("mailnews.nav_crosses_folders", Int), @@ -410,8 +409,6 @@ nsThunderbirdProfileMigrator::PrefTransform gTransforms[] = { MAKESAMETYPEPREFTRANSFORM("offline.download.download_messages", Int), MAKESAMETYPEPREFTRANSFORM("offline.send.unsent_messages", Int), MAKESAMETYPEPREFTRANSFORM("offline.startup_state", Int), - MAKESAMETYPEPREFTRANSFORM("plugin.override_internal_types", Bool), - MAKESAMETYPEPREFTRANSFORM("plugin.expose_full_path", Bool), MAKESAMETYPEPREFTRANSFORM("security.default_personal_cert", String), MAKESAMETYPEPREFTRANSFORM("security.password_lifetime", Int), MAKESAMETYPEPREFTRANSFORM("security.tls.version.min", Int), diff --git a/suite/components/pref/content/pref-scripts.xul b/suite/components/pref/content/pref-scripts.xul index 42aeee310c..4cefd71b0b 100644 --- a/suite/components/pref/content/pref-scripts.xul +++ b/suite/components/pref/content/pref-scripts.xul @@ -39,15 +39,6 @@ - - - @@ -97,31 +88,5 @@ accesskey="&debugConsoleJavascript.accesskey;" preference="javascript.options.showInConsole"/> - - - - - - - - - - - - - - diff --git a/suite/locales/en-US/chrome/common/pref/pref-scripts.dtd b/suite/locales/en-US/chrome/common/pref/pref-scripts.dtd index 18a32cbf3e..0cde0b99d4 100644 --- a/suite/locales/en-US/chrome/common/pref/pref-scripts.dtd +++ b/suite/locales/en-US/chrome/common/pref/pref-scripts.dtd @@ -27,13 +27,3 @@ - - - - - - - - - - diff --git a/suite/locales/en-US/chrome/mailnews/pref/mailPrefsOverlay.dtd b/suite/locales/en-US/chrome/mailnews/pref/mailPrefsOverlay.dtd index 466809a869..27c390c0f9 100644 --- a/suite/locales/en-US/chrome/mailnews/pref/mailPrefsOverlay.dtd +++ b/suite/locales/en-US/chrome/mailnews/pref/mailPrefsOverlay.dtd @@ -2,10 +2,6 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - - - diff --git a/suite/mailnews/components/prefs/content/mailPrefsOverlay.xul b/suite/mailnews/components/prefs/content/mailPrefsOverlay.xul index af2730d3b4..2a4acef93b 100644 --- a/suite/mailnews/components/prefs/content/mailPrefsOverlay.xul +++ b/suite/mailnews/components/prefs/content/mailPrefsOverlay.xul @@ -20,22 +20,6 @@ name="general.startup.addressbook" type="bool"/> - - - - - - - - diff --git a/suite/mailnews/jar.mn b/suite/mailnews/jar.mn index f6cebf43cc..5529995b02 100644 --- a/suite/mailnews/jar.mn +++ b/suite/mailnews/jar.mn @@ -13,7 +13,6 @@ messenger.jar: % content messenger-region %content/messenger-region/ % overlay chrome://communicator/content/pref/preferences.xul chrome://messenger/content/mailPrefsOverlay.xul % overlay chrome://communicator/content/pref/pref-appearance.xul chrome://messenger/content/mailPrefsOverlay.xul -% overlay chrome://communicator/content/pref/pref-scripts.xul chrome://messenger/content/mailPrefsOverlay.xul % overlay chrome://communicator/content/pref/pref-cookies.xul chrome://messenger/content/mailPrefsOverlay.xul % overlay chrome://editor/content/editorTasksOverlay.xul chrome://messenger/content/mailTasksOverlay.xul % overlay chrome://messenger/content/addressbook/abSelectAddressesDialog.xul chrome://messenger/content/mailOverlay.xul