From d7d80e3abb83bb68162c6403d20200fac7b643f3 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 5 May 2015 11:11:33 +0200 Subject: Update to Firefox 38 build 2 --- firefox-enable-addons.patch | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) (limited to 'firefox-enable-addons.patch') diff --git a/firefox-enable-addons.patch b/firefox-enable-addons.patch index 228201a..751d2ce 100644 --- a/firefox-enable-addons.patch +++ b/firefox-enable-addons.patch @@ -1,6 +1,6 @@ -diff -up mozilla-release/browser/app/profile/firefox.js.addons mozilla-release/browser/app/profile/firefox.js ---- mozilla-release/browser/app/profile/firefox.js.addons 2014-08-26 05:37:44.000000000 +0200 -+++ mozilla-release/browser/app/profile/firefox.js 2014-08-26 15:20:52.114149955 +0200 +diff -up mozilla-aurora/browser/app/profile/firefox.js.addons mozilla-aurora/browser/app/profile/firefox.js +--- mozilla-aurora/browser/app/profile/firefox.js.addons 2015-03-12 13:21:14.000000000 +0100 ++++ mozilla-aurora/browser/app/profile/firefox.js 2015-03-12 14:25:39.974909169 +0100 @@ -65,7 +65,8 @@ pref("extensions.hotfix.certs.1.sha1Fing // Disable add-ons that are not installed by the user in all scopes by default. @@ -11,17 +11,29 @@ diff -up mozilla-release/browser/app/profile/firefox.js.addons mozilla-release/b // Dictionary download preference pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); -diff -up mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm ---- mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons 2014-08-26 15:20:52.115149958 +0200 -+++ mozilla-release/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2014-08-26 15:29:16.229670636 +0200 -@@ -1888,8 +1888,8 @@ this.XPIProvider = { - // Changes to installed extensions may have changed which theme is selected - this.applyThemeChange(); +diff -up mozilla-aurora/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons mozilla-aurora/toolkit/mozapps/extensions/internal/XPIProvider.jsm +--- mozilla-aurora/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons 2015-03-12 14:25:39.975909166 +0100 ++++ mozilla-aurora/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2015-03-12 15:23:05.879366812 +0100 +@@ -2102,11 +2102,7 @@ this.XPIProvider = { + + AddonManagerPrivate.markProviderSafe(this); - if (aAppChanged === undefined) { - // For new profiles we will never need to show the add-on selection UI -+ if (true) { -+ // For all profiles we will never need to show the add-on selection UI - Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true); +- 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 +@@ -2126,6 +2122,9 @@ this.XPIProvider = { + flushCaches = true; + } + } ++ } else { ++ // For new 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 (flushCaches) { -- cgit