X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=enable-addons.patch;h=c21d629642346dbd00d8226bfb5752ac519ab05b;hb=ee36b7a;hp=9b18db8a4d06cacbe34e65a2dc54f341f414a4aa;hpb=3a30e2d72b7fa4799d8dbfbb0494479a2fc49ae6;p=packages%2Fthunderbird.git

diff --git a/enable-addons.patch b/enable-addons.patch
index 9b18db8..c21d629 100644
--- a/enable-addons.patch
+++ b/enable-addons.patch
@@ -1,5 +1,5 @@
---- comm-release/mail/app/profile/all-thunderbird.js.old	2011-11-21 11:20:08.000000000 +0100
-+++ comm-release/mail/app/profile/all-thunderbird.js	2011-12-14 12:40:24.074179826 +0100
+--- comm/mail/app/profile/all-thunderbird.js.old	2011-11-21 11:20:08.000000000 +0100
++++ comm/mail/app/profile/all-thunderbird.js	2011-12-14 12:40:24.074179826 +0100
 @@ -138,7 +138,7 @@ pref("extensions.update.autoUpdateDefaul
  // Disable add-ons installed into the shared user and shared system areas by
  // default. This does not include the application directory. See the SCOPE
@@ -7,43 +7,27 @@
 -pref("extensions.autoDisableScopes", 15);
 +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
-@@ -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
-+        // 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
+ // Enable add-ons installed and owned by the application, like the default theme.
+ pref("extensions.startupScanScopes", 4);
+--- comm/suite/app/profile/suite-prefs.js~	2013-11-06 19:54:38.789734061 +0100
++++ comm/suite/app/profile/suite-prefs.js	2013-11-06 20:55:33.765611935 +0100
 @@ -616,7 +616,7 @@
  // Disable add-ons installed into the shared user and shared system areas by
  // default. This does not include the application directory. See the SCOPE
- // constants in AddonManager.jsm for values to use here.
+ // constants in AddonManager.jsm for values to use here
 -pref("extensions.autoDisableScopes", 15);
 +pref("extensions.autoDisableScopes", 3);
  
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);  // also toggles personalized recommendations
---- comm-release/mozilla/browser/app/profile/firefox.js~	2013-10-29 02:20:40.000000000 +0100
-+++ comm-release/mozilla/browser/app/profile/firefox.js	2013-11-06 20:56:58.633092070 +0100
+ // Enable add-ons installed and owned by the application, like the default theme.
+ pref("extensions.startupScanScopes", 4);
+--- browser/app/profile/firefox.js~	2013-10-29 02:20:40.000000000 +0100
++++ browser/app/profile/firefox.js	2013-11-06 20:56:58.633092070 +0100
 @@ -62,7 +62,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", 3);
- 
- // Dictionary download preference
- pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
+ // Scopes to scan for changes at startup.
+ pref("extensions.startupScanScopes", 0);
+