- updated to 38.4.0

[packages/thunderbird.git] / enable-addons.patch

diff --git a/enable-addons.patch b/enable-addons.patch
index 5f62b448c524302be572beb34f0b6c6c5cb174a8..9b18db8a4d06cacbe34e65a2dc54f341f414a4aa 100644 (file)
--- a/enable-addons.patch
+++ b/enable-addons.patch
@@ -5,23 +5,26 @@
  // default. This does not include the application directory. See the SCOPE
  // constants in AddonManager.jsm for values to use here
 -pref("extensions.autoDisableScopes", 15);
-+pref("extensions.autoDisableScopes", 0);
++pref("extensions.autoDisableScopes", 3);
  
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);
 --- comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons    2011-11-21 11:28:32.000000000 +0100
 +++ comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm   2011-12-14 12:43:42.461184351 +0100
-@@ -1591,8 +1591,8 @@ var XPIProvider = {
-         this.showUpgradeUI();
-         flushCaches = true;
-       }
--      else if (aAppChanged === undefined) {
+@@ -2102,11 +2102,9 @@ var XPIProvider = {
+ 
+       AddonManagerPrivate.markProviderSafe(this);
+ 
+-      if (aAppChanged === undefined) {
 -        // For new profiles we will never need to show the add-on selection UI
-+      else {
 +        // For all profiles we will never need to show the add-on selection UI
          Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
-       }
- 
+-      }
+-      else if (aAppChanged && !this.allAppGlobal &&
++      if (aAppChanged && !this.allAppGlobal &&
+                Preferences.get(PREF_EM_SHOW_MISMATCH_UI, true)) {
+         if (!Preferences.get(PREF_SHOWN_SELECTION_UI, false)) {
+           // Flip a flag to indicate that we interrupted startup with an interactive prompt
 --- comm-release/suite/browser/browser-prefs.js~       2013-11-06 19:54:38.789734061 +0100
 +++ comm-release/suite/browser/browser-prefs.js        2013-11-06 20:55:33.765611935 +0100
 @@ -616,7 +616,7 @@
@@ -29,7 +32,7 @@
  // default. This does not include the application directory. See the SCOPE
  // constants in AddonManager.jsm for values to use here.
 -pref("extensions.autoDisableScopes", 15);
-+pref("extensions.autoDisableScopes", 0);
++pref("extensions.autoDisableScopes", 3);
  
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);  // also toggles personalized recommendations
@@ -40,7 +43,7 @@
  // Disable add-ons that are not installed by the user in all scopes by default.
  // See the SCOPE constants in AddonManager.jsm for values to use here.
 -pref("extensions.autoDisableScopes", 15);
-+pref("extensions.autoDisableScopes", 0);
++pref("extensions.autoDisableScopes", 3);
  
  // Dictionary download preference
  pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");