mozilla-firefox/patches/mozilla-firefox-1.0.7-gnome-uriloader.patch

--- mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp.foo	2004-01-05 18:38:48.000000000 -0500
+++ mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp	2004-01-05 19:14:51.000000000 -0500
@@ -39,6 +39,7 @@
 #include "nsGNOMERegistry.h"
 #include "prlink.h"
 #include "prmem.h"
+#include "prenv.h"
 #include "nsString.h"
 #include "nsIComponentManager.h"
 #include "nsILocalFile.h"
@@ -137,6 +138,10 @@
     } \
     PR_END_MACRO
 
+  // Don't even use this code if an env var is set
+  if (PR_GetEnv("MOZ_DISABLE_GNOME"))
+    return;
+
   // Attempt to open libgconf
   gconfLib = LoadVersionedLibrary("gconf-2", ".4");
   ENSURE_LIB(gconfLib);
1	--- mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp.foo 2004-01-05 18:38:48.000000000 -0500
2	+++ mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp 2004-01-05 19:14:51.000000000 -0500
3	@@ -39,6 +39,7 @@
4	#include "nsGNOMERegistry.h"
5	#include "prlink.h"
6	#include "prmem.h"
7	+#include "prenv.h"
8	#include "nsString.h"
9	#include "nsIComponentManager.h"
10	#include "nsILocalFile.h"
11	@@ -137,6 +138,10 @@
12	} \
13	PR_END_MACRO
14
15	+ // Don't even use this code if an env var is set
16	+ if (PR_GetEnv("MOZ_DISABLE_GNOME"))
17	+ return;
18	+
19	// Attempt to open libgconf
20	gconfLib = LoadVersionedLibrary("gconf-2", ".4");
21	ENSURE_LIB(gconfLib);