|
 |
e75128 |
diff -up comm-esr31/mail/app/profile/all-thunderbird.js.addons comm-esr31/mail/app/profile/all-thunderbird.js
|
|
|
e75128 |
--- comm-esr31/mail/app/profile/all-thunderbird.js.addons 2014-07-18 02:04:05.000000000 +0200
|
|
|
e75128 |
+++ comm-esr31/mail/app/profile/all-thunderbird.js 2014-07-29 15:29:11.949728141 +0200
|
|
|
e75128 |
@@ -174,7 +174,7 @@ pref("extensions.update.autoUpdateDefaul
|
|
|
e75128 |
// Disable add-ons installed into the shared user and shared system areas by
|
|
|
e75128 |
// default. This does not include the application directory. See the SCOPE
|
|
|
e75128 |
// constants in AddonManager.jsm for values to use here
|
|
|
e75128 |
-pref("extensions.autoDisableScopes", 15);
|
|
|
e75128 |
+pref("extensions.autoDisableScopes", 0);
|
|
|
e75128 |
|
|
|
e75128 |
// Preferences for AMO integration
|
|
|
e75128 |
pref("extensions.getAddons.cache.enabled", true);
|
|
|
e75128 |
diff -up comm-esr31/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons comm-esr31/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm
|
|
|
e75128 |
--- comm-esr31/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons 2014-07-29 15:29:11.951728146 +0200
|
|
|
e75128 |
+++ comm-esr31/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2014-07-29 15:30:51.879030210 +0200
|
|
|
e02199 |
@@ -2102,11 +2102,7 @@ this.XPIProvider = {
|
|
|
e02199 |
|
|
|
e02199 |
AddonManagerPrivate.markProviderSafe(this);
|
|
|
e02199 |
|
|
|
e02199 |
- if (aAppChanged === undefined) {
|
|
|
e75128 |
- // For new profiles we will never need to show the add-on selection UI
|
|
|
e02199 |
- Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
|
|
|
e02199 |
- }
|
|
|
e02199 |
- else if (aAppChanged && !this.allAppGlobal &&
|
|
|
e02199 |
+ if (aAppChanged && !this.allAppGlobal &&
|
|
|
e02199 |
Preferences.get(PREF_EM_SHOW_MISMATCH_UI, true)) {
|
|
|
e02199 |
if (!Preferences.get(PREF_SHOWN_SELECTION_UI, false)) {
|
|
|
e02199 |
// Flip a flag to indicate that we interrupted startup with an interactive prompt
|
|
|
e02199 |
@@ -2126,6 +2122,9 @@ this.XPIProvider = {
|
|
|
e02199 |
flushCaches = true;
|
|
|
e02199 |
}
|
|
|
e02199 |
}
|
|
|
e02199 |
+ } else {
|
|
|
e02199 |
+ // For new profiles we will never need to show the add-on selection UI
|
|
|
e02199 |
+ Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
|
|
|
e75128 |
}
|
|
|
e75128 |
|
|
|
e02199 |
if (flushCaches) {
|