Contents of /trunk/mozilla-firefox/patches/mozilla-firefox-1.0.7-gnome-uriloader.patch
Parent Directory | Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 650 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 650 byte(s)
-import
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); |