Bug 562318, bustage fix: make firefox.js identical again for OSX 10.5 PPC and x86.

This commit is contained in:
Zack Weinberg 2010-05-01 15:39:53 -07:00
parent ac5aa203f5
commit 1bd1798a5a

View File

@ -904,15 +904,19 @@ pref("toolbar.customization.usesheet", true);
pref("toolbar.customization.usesheet", false);
#endif
#ifdef MOZ_IPC
// The default for this pref reflects whether the build is capable of IPC.
// (Turning it on in a no-IPC build will have no effect.)
#ifdef XP_MACOSX
// OSX still has only partial support for IPC. Note that the PowerPC
// and x86 builds must generate identical copies of this file, so we
// can't make the prefs indicate that IPC is not available at all in
// PowerPC builds.
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_npapi.plugin", true);
#else
#elifdef MOZ_IPC
pref("dom.ipc.plugins.enabled", true);
#endif
#else
pref("dom.ipc.plugins.enabled", false);
#endif