summaryrefslogtreecommitdiff
path: root/libre/iceweasel-libre/vendor.js
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-11-13 21:55:19 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-11-13 21:55:19 -0500
commitfe6594d5a8354c8662a730102eaf7b5ba29bfcfd (patch)
tree628a2f3835ae7c47f787a3fbf1694f28f37326c4 /libre/iceweasel-libre/vendor.js
parentc865c99debc0473cb5a801fd9c151fa9e0a99401 (diff)
parenta00610bbb81d635636889efbd5d7eceb374469d1 (diff)
Merge remote-tracking branch 'remotes/pgl/master' into HEAD
Diffstat (limited to 'libre/iceweasel-libre/vendor.js')
-rw-r--r--libre/iceweasel-libre/vendor.js10
1 files changed, 4 insertions, 6 deletions
diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js
index 91414dbbd..6510944a7 100644
--- a/libre/iceweasel-libre/vendor.js
+++ b/libre/iceweasel-libre/vendor.js
@@ -8,17 +8,15 @@ pref("browser.shell.checkDefaultBrowser", false);
pref("extensions.autoDisableScopes", 11);
pref("extensions.shownSelectionUI", true);
+// Disable Social API
+pref("social.remote-install.enabled", false);
+
// Make sure that safebrowsing is disabled
pref("browser.safebrowsing.enabled", false);
pref("browser.safebrowsing.malware.enabled", false);
-pref("keyword.URL", "");
-pref("app.update.enabled", false);
-pref("app.update.auto", false);
+// Disable localstorage for privacy reasons.
pref("dom.storage.enabled", false);
-// Disable Social API
-pref("social.remote-install.enabled", false);
-
// Disable missing nonfree flash notification
pref("plugins.notifyMissingFlash", false);