Fixed extension compatibility dialog (rhbz#963422)

This commit is contained in:
Tigro 2013-05-21 14:18:43 +04:00
parent 50feb2d8af
commit 90a333c3b9
2 changed files with 36 additions and 2 deletions

View file

@ -0,0 +1,28 @@
diff -up firefox-21.0/mozilla-release/browser/app/profile/firefox.js.addons firefox-21.0/mozilla-release/browser/app/profile/firefox.js
--- firefox-21.0/mozilla-release/browser/app/profile/firefox.js.addons 2013-05-11 21:19:20.000000000 +0200
+++ firefox-21.0/mozilla-release/browser/app/profile/firefox.js 2013-05-16 12:02:13.840660585 +0200
@@ -61,7 +61,8 @@ pref("extensions.hotfix.certs.1.sha1Fing
// 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.showMismatchUI", false);
// Dictionary download preference
pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
diff -up firefox-21.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm.addons firefox-21.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm
diff -up firefox-15.0/mozilla-beta/toolkit/mozapps/extensions/XPIProvider.jsm.addons firefox-15.0/mozilla-beta/toolkit/mozapps/extensions/XPIProvider.jsm
--- firefox-15.0/mozilla-beta/toolkit/mozapps/extensions/XPIProvider.jsm.addons 2012-08-15 07:48:32.000000000 +0200
+++ firefox-15.0/mozilla-beta/toolkit/mozapps/extensions/XPIProvider.jsm 2012-08-21 11:56:41.441980035 +0200
@@ -1630,8 +1630,8 @@ var XPIProvider = {
this.showUpgradeUI();
flushCaches = true;
}
- else 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);
}

View file

@ -31,7 +31,7 @@
%define _use_syshunspell 0 %define _use_syshunspell 0
%define release 1 %define release 2
%define update_channel release %define update_channel release
@ -80,6 +80,11 @@ Patch34: xulrunner_nojit.patch
# (cjw) use system virtualenv # (cjw) use system virtualenv
Patch36: firefox-17.0-virtualenv.patch Patch36: firefox-17.0-virtualenv.patch
# ROSA
Patch90: firefox-15.0-enable-addons.patch
BuildRequires: gtk+2-devel BuildRequires: gtk+2-devel
BuildRequires: unzip BuildRequires: unzip
BuildRequires: zip BuildRequires: zip
@ -198,6 +203,7 @@ Files and macros mainly for building Firefox extensions.
%endif %endif
%endif %endif
%patch15 -p2 -b .addons
pushd js/src pushd js/src
autoconf-2.13 autoconf-2.13
@ -392,7 +398,7 @@ if [ ! -r /etc/sysconfig/oem ]; then
*desktop) bookmark="mozilla-one.html";; *desktop) bookmark="mozilla-one.html";;
*) bookmark="mozilla-download.html";; *) bookmark="mozilla-download.html";;
esac esac
ln -s -f ../../../../share/mdk/bookmarks/mozilla/$bookmark %{mozillalibdir}/browser/defaults/profile/bookmarks.html ln -s -f ../../../../share/mdk/bookmarks/mozilla/$bookmark %{mozillalibdir}/defaults/profile/bookmarks.html
fi fi
%files %files