[tor-commits] [torbrowser/master] update firefox prefs and set enabledScopes to 1 to hopefully disable system-wide plugin searching

[erinn at torproject.org]

commit d6893633c3c35dac2041f8abcd7e1e170f74fabf
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue May 3 02:26:51 2011 +0300

    update firefox prefs and set enabledScopes to 1 to hopefully disable system-wide plugin searching
---
 build-scripts/config/no-polipo-4.0.js |    8 +++-----
 build-scripts/config/windows-4.0.js   |    2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/build-scripts/config/no-polipo-4.0.js b/build-scripts/config/no-polipo-4.0.js
index 086d602..1192ec8 100644
--- a/build-scripts/config/no-polipo-4.0.js
+++ b/build-scripts/config/no-polipo-4.0.js
@@ -60,13 +60,12 @@ user_pref("extensions.bprivacy.DataDir", "/Users/erinn/Library/Preferences/Macro
 user_pref("extensions.bprivacy.donotaskforfolder", true);
 user_pref("extensions.bprivacy.donotaskonexit", true);
 user_pref("extensions.bprivacy.initiated", true);
-user_pref("extensions.checkCompatibility.4.0", false);
+user_pref("extensions.checkCompatibility.4.*", false);
 user_pref("extensions.checkUpdateSecurity", false);
 user_pref("extensions.databaseSchema", 3);
-user_pref("extensions.enabledAddons", "https-everywhere at eff.org:0.9.9.development.4,{73a6fe31-595d-460b-a920-fcc0f8843232}:2.0.9.9,{d40f5e7b-d2cf-4856-b441-cc613eeffbe3}:1.49,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.3.2-alpha,{972ce4c6-7e08-4474-a285-3208198ce6fd}:4.0");
+user_pref("extensions.enabledAddons", "https-everywhere at eff.org:0.9.9.development.4,{73a6fe31-595d-460b-a920-fcc0f8843232}:2.1.0.3,{d40f5e7b-d2cf-4856-b441-cc613eeffbe3}:1.50,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.3.3-alpha");
 user_pref("extensions.enabledItems", "langpack-en-US at firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8");
-user_pref("extensions.enabledScopes", 5);
-user_pref("extensions.lastAppVersion", "4.0");
+user_pref("extensions.enabledScopes", 1);
 user_pref("extensions.pendingOperations", false);
 user_pref("extensions.torbutton.fresh_install", false);
 user_pref("extensions.torbutton.locked_mode", true);
@@ -139,7 +138,6 @@ user_pref("noscript.showUntrusted", false);
 user_pref("noscript.subscription.lastCheck", -142148139);
 user_pref("noscript.temp", "");
 user_pref("noscript.untrusted", "");
-user_pref("noscript.version", "2.0.9.9");
 user_pref("places.history.enabled", false);
 user_pref("places.history.expiration.transient_current_max_pages", 120795);
 user_pref("plugin.disable_full_page_plugin_for_types", "application/asx,video/x-ms-asf-plugin,application/x-mplayer2,video/x-ms-asf,video/x-ms-wm,audio/x-ms-wma,audio/x-ms-wax,video/x-ms-wmv,video/x-ms-wvx,application/x-drm-v2,application/x-drm");
diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js
index b35a3a8..bf90262 100644
--- a/build-scripts/config/windows-4.0.js
+++ b/build-scripts/config/windows-4.0.js
@@ -66,7 +66,7 @@ user_pref("extensions.checkUpdateSecurity", false);
 user_pref("extensions.databaseSchema", 3);
 user_pref("extensions.enabledAddons", "https-everywhere at eff.org:0.9.9.development.4,{73a6fe31-595d-460b-a920-fcc0f8843232}:2.0.9.9,{d40f5e7b-d2cf-4856-b441-cc613eeffbe3}:1.49,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.3.2-alpha,{972ce4c6-7e08-4474-a285-3208198ce6fd}:4.0");
 user_pref("extensions.enabledItems", "langpack-en-US at firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8");
-user_pref("extensions.enabledScopes", 5);
+user_pref("extensions.enabledScopes", 1);
 user_pref("extensions.lastAppVersion", "4.0");
 user_pref("extensions.pendingOperations", false);
 user_pref("extensions.torbutton.fresh_install", false);