[patch] Finish removing gconf dep

mozilla-2.0_finish_removing_gconf.patch (text/plain), 1.05 KB, created by Jory A. Pratt on 2011-05-16 14:58:18 UTC

# HG changeset patch
# Parent 2c4a0ac34b335b058bb2e69ccb29099cc2c6dd61

diff --git a/extensions/pref/system-pref/src/Makefile.in b/extensions/pref/system-pref/src/Makefile.in
--- a/extensions/pref/system-pref/src/Makefile.in
+++ b/extensions/pref/system-pref/src/Makefile.in
@@ -52,8 +52,10 @@
 
 
 ifdef MOZ_ENABLE_GTK2
+ifdef MOZ_ENABLE_GCONF
 DIRS		= gconf
 endif
+endif
 
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
--- a/widget/src/gtk2/nsWindow.cpp
+++ b/widget/src/gtk2/nsWindow.cpp
@@ -4227,6 +4227,7 @@
             sAccessibilityEnabled = atoi(envValue) != 0;
             LOG(("Accessibility Env %s=%s\n", sAccEnv, envValue));
         }
+#ifdef MOZ_ENABLE_GCONF
         //check gconf-2 setting
         else {
             nsCOMPtr<nsIPrefBranch> sysPrefService =
@@ -4238,7 +4239,7 @@
                 sysPrefService->GetBoolPref(sAccessibilityKey,
                                             &sAccessibilityEnabled);
             }
-
+#endif
         }
     }
     if (sAccessibilityEnabled) {