Backout changeset 1f8010810cee due to bustage.
authorMarco Bonardo <mbonardo@mozilla.com>
Fri, 08 Jul 2011 11:36:54 +0200
changeset 73323 15546d781966aef892cb560bd58cde99a7e703da
parent 73322 1f8010810cee3c3f681cc317384e9b49ca6eedd2
child 73324 5479a346b95b82162c72419a95cbb4022cbbfe4d
push idunknown
push userunknown
push dateunknown
milestone8.0a1
backs out1f8010810cee3c3f681cc317384e9b49ca6eedd2
Backout changeset 1f8010810cee due to bustage.
extensions/pref/Makefile.in
extensions/pref/system-pref/src/Makefile.in
toolkit/library/libxul-config.mk
toolkit/library/nsStaticXULComponents.cpp
widget/src/gtk2/nsWindow.cpp
--- a/extensions/pref/Makefile.in
+++ b/extensions/pref/Makefile.in
@@ -41,14 +41,12 @@ topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 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
--- a/extensions/pref/system-pref/src/Makefile.in
+++ b/extensions/pref/system-pref/src/Makefile.in
@@ -47,20 +47,18 @@ LIBRARY_NAME = system-pref_s
 SHORT_LIBNAME = syspref
 
 # We want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 
 ifdef MOZ_ENABLE_GTK2
-ifdef MOZ_ENABLE_GCONF
 DIRS		= gconf
 endif
-endif
 
 CPPSRCS =   \
   nsSystemPref.cpp	   \
   $(NULL)
 
 EXPORTS		= \
 		nsSystemPrefLog.h \
 		$(NULL)
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -255,21 +255,19 @@ COMPONENT_LIBS += \
 	satchel \
 	pippki \
 	$(NULL)
 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
 STATIC_LIBS += gtkxtbin
 endif
 endif
 
 # Platform-specific icon channel stuff - supported mostly-everywhere
--- a/toolkit/library/nsStaticXULComponents.cpp
+++ b/toolkit/library/nsStaticXULComponents.cpp
@@ -106,24 +106,22 @@
 #ifdef MOZ_ENABLE_XREMOTE
 #define XREMOTE_MODULES MODULE(RemoteServiceModule)
 #else
 #define XREMOTE_MODULES
 #endif
 
 #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
 
 #ifdef ENABLE_LAYOUTDEBUG
 #define LAYOUT_DEBUG_MODULE MODULE(nsLayoutDebugModule)
 #else
 #define LAYOUT_DEBUG_MODULE
--- a/widget/src/gtk2/nsWindow.cpp
+++ b/widget/src/gtk2/nsWindow.cpp
@@ -4224,17 +4224,16 @@ nsWindow::Create(nsIWidget        *aPare
              GDK_WINDOW_XWINDOW(mGdkWindow)));
     }
 
     // resize so that everything is set to the right dimensions
     if (!mIsTopLevel)
         Resize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, PR_FALSE);
 
 #ifdef ACCESSIBILITY
-#ifdef MOZ_ENABLE_GCONF
     nsresult rv;
     if (!sAccessibilityChecked) {
         sAccessibilityChecked = PR_TRUE;
 
         //check if accessibility enabled/disabled by environment variable
         const char *envValue = PR_GetEnv(sAccEnv);
         if (envValue) {
             sAccessibilityEnabled = atoi(envValue) != 0;
@@ -4246,22 +4245,21 @@ nsWindow::Create(nsIWidget        *aPare
                 do_GetService(sSysPrefService, &rv);
             if (NS_SUCCEEDED(rv) && sysPrefService) {
 
                 // do the work to get gconf setting.
                 // will be done soon later.
                 sysPrefService->GetBoolPref(sAccessibilityKey,
                                             &sAccessibilityEnabled);
             }
+
         }
     }
 #endif
 
-#endif
-
 #ifdef MOZ_DFB
     if (!mDFB) {
          DirectFBCreate( &mDFB );
 
          D_ASSUME( mDFB != NULL );
 
          if (mDFB)
               mDFB->GetDisplayLayer( mDFB, DLID_PRIMARY, &mDFBLayer );