Search
j0ke.net Open Build Service
>
Projects
>
mozilla
>
seamonkey
> disable-gconf.patch
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File disable-gconf.patch of Package seamonkey
Index: uriloader/exthandler/unix/nsGNOMERegistry.cpp =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp,v retrieving revision 1.8 diff -u -p -6 -r1.8 nsGNOMERegistry.cpp --- uriloader/exthandler/unix/nsGNOMERegistry.cpp 6 Mar 2004 14:41:00 -0000 1.8 +++ uriloader/exthandler/unix/nsGNOMERegistry.cpp 7 Mar 2005 19:33:10 -0000 @@ -36,12 +36,13 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsGNOMERegistry.h" #include "prlink.h" #include "prmem.h" +#include "prenv.h" #include "nsString.h" #include "nsIComponentManager.h" #include "nsILocalFile.h" #include "nsMIMEInfoImpl.h" #include "nsAutoPtr.h" @@ -139,12 +140,16 @@ nsGNOMERegistry::Startup() if (!_##func) { \ CleanUp(); \ return; \ } \ PR_END_MACRO + // Don't use this code if an env var is set + if (PR_GetEnv("MOZ_DISABLE_GCONF")) + return; + // Attempt to open libgconf gconfLib = LoadVersionedLibrary("gconf-2", ".4"); ENSURE_LIB(gconfLib); GET_LIB_FUNCTION(gconf, gconf_client_get_default); GET_LIB_FUNCTION(gconf, gconf_client_get_string);