Bug 542316 followup (change pref name), a=stuart
authorGavin Sharp <gavin@gavinsharp.com>
Tue, 26 Jan 2010 18:34:11 -0500
changeset 65994 f6f11b0b46de17421d5d1972141930699debeda5
parent 65993 f34daf5a90dce1d78dd635a1ad0ec7f05a7b068f
child 65995 3050c638f93d0a2b8fcf0ad6197756e00ed91cbe
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersstuart
bugs542316
Bug 542316 followup (change pref name), a=stuart
mobile/app/mobile.js
--- a/mobile/app/mobile.js
+++ b/mobile/app/mobile.js
@@ -308,18 +308,16 @@ pref("privacy.item.offlineApps", true);
 pref("privacy.item.history", true);
 pref("privacy.item.formdata", true);
 pref("privacy.item.downloads", true);
 pref("privacy.item.passwords", true);
 pref("privacy.item.sessions", true);
 pref("privacy.item.geolocation", true);
 pref("privacy.item.siteSettings", true);
 
-pref("plugin.load_plugins", false);
-
 #ifdef MOZ_PLATFORM_HILDON
 pref("plugins.force.wmode", "opaque");
 #endif
 
 // URL to the Learn More link XXX this is the firefox one.  Bug 495578 fixes this.
 pref("browser.geolocation.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/geolocation/");
 
 // base url for the wifi geolocation network provider
@@ -352,17 +350,18 @@ pref("dom.max_script_run_time", 20);
 pref("browser.console.showInPanel", false);
 
 // kinetic tweakables
 pref("browser.ui.kinetic.updateInterval", 30);
 pref("browser.ui.kinetic.decelerationRate", 20);
 pref("browser.ui.kinetic.speedSensitivity", 80);
 pref("browser.ui.kinetic.swipeLength", 160);
 
-// Disable default plugin
+// plugins
+pref("plugin.disable", true);
 pref("plugin.default_plugin_disabled", true);
 
 // product URLs
 pref("app.releaseNotesURL", "http://www.mozilla.com/%LOCALE%/mobile/%VERSION%/releasenotes/");
 //pref("app.support.baseURL", "http://support.mozilla.com/1/mobile/%VERSION%/%OS%/%LOCALE%/");
 pref("app.support.baseURL", "http://mobile.support.mozilla.com/");
 pref("app.faqURL", "http://www.mozilla.com/%LOCALE%/mobile/faq/");
 pref("app.privacyURL", "http://www.mozilla.com/%LOCALE%/legal/privacy/firefox/mobile/");