[patch] patch v3 sending upstream.

mozilla-2.0_finish_removing_gconf.patch (text/plain), 2.29 KB, created by Jory A. Pratt on 2011-05-18 21:25:01 UTC

# HG changeset patch
# Parent 2dbc5865a1594bc3b15be2df9ed429ddccee7ecd

diff --git a/extensions/pref/Makefile.in b/extensions/pref/Makefile.in
--- a/extensions/pref/Makefile.in
+++ b/extensions/pref/Makefile.in
@@ -46,7 +46,9 @@
 DIRS             = autoconfig
 
 ifdef MOZ_ENABLE_GTK2
+ifdef MOZ_ENABLE_GCONF
 DIRS		+= system-pref
 endif
+endif
 
 include $(topsrcdir)/config/rules.mk
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/toolkit/library/libxul-config.mk b/toolkit/library/libxul-config.mk
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -264,9 +264,11 @@
 ifdef MOZ_ENABLE_GTK2
 COMPONENT_LIBS += widget_gtk2
 ifdef MOZ_PREF_EXTENSIONS
+ifdef MOZ_ENABLE_GCONF
 COMPONENT_LIBS += system-pref
 endif
 endif
+endif
 
 ifdef MOZ_ENABLE_GTK2
 ifdef MOZ_X11
diff --git a/toolkit/library/nsStaticXULComponents.cpp b/toolkit/library/nsStaticXULComponents.cpp
--- a/toolkit/library/nsStaticXULComponents.cpp
+++ b/toolkit/library/nsStaticXULComponents.cpp
@@ -111,12 +111,14 @@
 
 #ifdef MOZ_PREF_EXTENSIONS
 #ifdef MOZ_ENABLE_GTK2
+#ifdef MOZ_ENABLE_GCONF
 #define SYSTEMPREF_MODULES \
     MODULE(nsSystemPrefModule) \
     MODULE(nsAutoConfigModule)
 #else
 #define SYSTEMPREF_MODULES MODULE(nsAutoConfigModule)
 #endif
+#endif
 #else
 #define SYSTEMPREF_MODULES
 #endif
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
@@ -4217,6 +4217,7 @@
         Resize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, PR_FALSE);
 
 #ifdef ACCESSIBILITY
+#ifdef MOZ_ENABLE_GCONF
     nsresult rv;
     if (!sAccessibilityChecked) {
         sAccessibilityChecked = PR_TRUE;
@@ -4238,9 +4239,10 @@
                 sysPrefService->GetBoolPref(sAccessibilityKey,
                                             &sAccessibilityEnabled);
             }
-
         }
     }
+#endif
+
     if (sAccessibilityEnabled) {
         LOG(("nsWindow:: Create Toplevel Accessibility\n"));
         CreateRootAccessible();