rediffed patches

diff --git a/enable-addons.patch b/enable-addons.patch
index 8aab52faeb4c551e274bfb793f8b49c7d3ed5ed8..c21d629642346dbd00d8226bfb5752ac519ab05b 100644 (file)
--- a/enable-addons.patch
+++ b/enable-addons.patch
@@ -7,8 +7,8 @@
 -pref("extensions.autoDisableScopes", 15);
 +pref("extensions.autoDisableScopes", 3);
  
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);
+ // 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 @@

diff --git a/prefs.patch b/prefs.patch
index 6ebb47821137876d66ed117314f3d7f7a03b8468..a3e81b91722f61d75a49cc2a458c6fd1e1219cee 100644 (file)
--- a/prefs.patch
+++ b/prefs.patch
@@ -8,7 +8,7 @@
 + pref("app.update.auto", false);
  #endif
  
- // If set to true, the Update Service will present no UI for any event.
+ // If set to true, the Update Service will apply updates in the background
 @@ -416,7 +416,7 @@
  #endif
  
@@ -26,5 +26,5 @@
  pref("javascript.options.discardSystemSource", false);
 +pref("javascript.options.showInConsole",    true);
  
- // Many of the the following preferences tune the SpiderMonkey GC, if yo
+ // Many of the the following preferences tune the SpiderMonkey GC, if you
  // change the defaults here please also consider changing them in