mozilla-central: changeset 40217:1147cf4cdf63d49e73a44ec287241e9254844316

author	Josh Aas <joshmoz@gmail.com>
	Mon, 05 Apr 2010 12:33:10 -0400
changeset 40217	1147cf4cdf63d49e73a44ec287241e9254844316
parent 40216	72c7b128abaae0dd3a9b0282e88d3dc8bce5ea78
child 40218	3549ea4a9bd997815932b9e20e0fa5984a484620
push id	12607
push user	josh@mozilla.com
push date	Mon, 05 Apr 2010 16:33:29 +0000
treeherder	mozilla-central@1147cf4cdf63 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
bugs	556092
milestone	1.9.3a4pre
first release with	nightly linux32 523d0f8e0926 / 3.7a4pre / 20100406030657 / files nightly linux64 523d0f8e0926 / 3.7a4pre / 20100406030619 / files nightly mac 523d0f8e0926 / 3.7a4pre / 20100406030617 / files nightly win32 523d0f8e0926 / 3.7a4pre / 20100406040007 / files nightly win64 5f85f8f99743 / 3.7a5pre / 20100528110451 / files
last release without	nightly linux32 c4df407008b5 / 3.7a4pre / 20100405030428 / files nightly linux64 c4df407008b5 / 3.7a4pre / 20100405030628 / files nightly mac c4df407008b5 / 3.7a4pre / 20100405030622 / files nightly win32 c4df407008b5 / 3.7a4pre / 20100405051240 / files

browser/app/profile/firefox.js

file | annotate | diff | comparison | revisions

--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -904,17 +904,17 @@ pref("toolbar.customization.usesheet", t
 #else
 pref("toolbar.customization.usesheet", false);
 #endif
 
 #ifdef XP_MACOSX
 pref("dom.ipc.plugins.enabled", false);
 // These plug-ins will run OOP by default
 pref("dom.ipc.plugins.enabled.flash player.plugin", true);
-pref("dom.ipc.plugins.enabled.javaplugin2.plugin", true);
+pref("dom.ipc.plugins.enabled.javaplugin2_npapi.plugin", true);
 #else
 pref("dom.ipc.plugins.enabled", true);
 #endif
 
 #ifdef XP_WIN
 #ifndef WINCE
 pref("browser.taskbar.previews.enable", true);
 pref("browser.taskbar.previews.max", 20);