Backout changeset 1f8010810cee due to bustage.

extensions/pref/Makefile.in

@@ -46,9 +46,7 @@ include $(DEPTH)/config/autoconf.mk
 DIRS             = autoconfig
 
 ifdef MOZ_ENABLE_GTK2
-ifdef MOZ_ENABLE_GCONF
 DIRS		+= system-pref
 endif
-endif
 
 include $(topsrcdir)/config/rules.mk

extensions/pref/system-pref/src/Makefile.in

@@ -52,10 +52,8 @@ LIBXUL_LIBRARY = 1
 
 
 ifdef MOZ_ENABLE_GTK2
-ifdef MOZ_ENABLE_GCONF
 DIRS		= gconf
 endif
-endif
 
 CPPSRCS =   \
   nsSystemPref.cpp	   \

toolkit/library/libxul-config.mk

@@ -260,11 +260,9 @@ endif
 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

toolkit/library/nsStaticXULComponents.cpp

@@ -111,14 +111,12 @@
 
 #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

widget/src/gtk2/nsWindow.cpp

@@ -4229,7 +4229,6 @@ nsWindow::Create(nsIWidget        *aParent,
         Resize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, PR_FALSE);
 
 #ifdef ACCESSIBILITY
-#ifdef MOZ_ENABLE_GCONF
     nsresult rv;
     if (!sAccessibilityChecked) {
         sAccessibilityChecked = PR_TRUE;
@@ -4251,12 +4250,11 @@ nsWindow::Create(nsIWidget        *aParent,
                 sysPrefService->GetBoolPref(sAccessibilityKey,
                                             &sAccessibilityEnabled);
             }
+
         }
     }
 #endif
 
-#endif
-
 #ifdef MOZ_DFB
     if (!mDFB) {
          DirectFBCreate( &mDFB );