Disabled addon check UI (#753551)

3 files changed, 27 insertions, 8 deletions

diff --git a/firefox-8.0-enable-addons.patch b/firefox-8.0-enable-addons.patch
index ae847f8..795b082 100644
--- a/firefox-8.0-enable-addons.patch
+++ b/firefox-8.0-enable-addons.patch
@@ -1,6 +1,6 @@
-diff -up firefox-8.0/mozilla-release/browser/app/profile/firefox.js.old firefox-8.0/mozilla-release/browser/app/profile/firefox.js
---- firefox-8.0/mozilla-release/browser/app/profile/firefox.js.old	2011-11-04 22:33:52.000000000 +0100
-+++ firefox-8.0/mozilla-release/browser/app/profile/firefox.js	2011-11-14 23:21:49.841058452 +0100
+diff -up firefox-8.0/mozilla-release/browser/app/profile/firefox.js.addons firefox-8.0/mozilla-release/browser/app/profile/firefox.js
+--- firefox-8.0/mozilla-release/browser/app/profile/firefox.js.addons	2011-11-04 22:33:52.000000000 +0100
++++ firefox-8.0/mozilla-release/browser/app/profile/firefox.js	2011-11-15 10:35:31.446869396 +0100
 @@ -77,7 +77,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
@@ -10,3 +10,17 @@ diff -up firefox-8.0/mozilla-release/browser/app/profile/firefox.js.old firefox-
  
  // Dictionary download preference
  pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
+diff -up firefox-8.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm.addons firefox-8.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm
+--- firefox-8.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm.addons	2011-11-04 22:34:18.000000000 +0100
++++ firefox-8.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm	2011-11-15 10:42:17.866426274 +0100
+@@ -1591,8 +1591,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);
+     }
+ 
diff --git a/firefox-redhat-default-prefs.js b/firefox-redhat-default-prefs.js
index a3f2e4c..2ffdf5c 100644
--- a/firefox-redhat-default-prefs.js
+++ b/firefox-redhat-default-prefs.js
@@ -1,10 +1,12 @@
-pref("app.update.auto", false);
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
+pref("app.update.auto",                     false);
+pref("app.update.enabled",                  false);
+pref("app.update.autoInstallEnabled",       false);
 pref("browser.backspace_action",            2);
 pref("browser.display.use_system_colors",   true);
 pref("browser.download.folderList",         1);
 pref("browser.link.open_external",          3);
 pref("browser.shell.checkDefaultBrowser",   false);
 pref("network.manage-offline-status",       true);
-pref("dom.ipc.plugins.enabled.nswrapper*",  false);
\ No newline at end of file
+pref("dom.ipc.plugins.enabled.nswrapper*",  false);
+pref("extensions.shownSelectionUI",         true);
+pref("extensions.autoDisableScope",         0);
\ No newline at end of file
diff --git a/firefox.spec b/firefox.spec
index 76bfab1..8a333a9 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -44,7 +44,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        8.0
-Release:        2%{?pre_tag}%{?dist}
+Release:        3%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -341,6 +341,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Nov 15 2011 Martin Stransky <stransky@redhat.com> - 8.0-3
+- Disabled addon check UI (#753551)
+
 * Tue Nov 15 2011 Martin Stransky <stransky@redhat.com> - 8.0-2
 - Temporary workaround for langpacks (#753551)