Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 645793 - Finish disabling gconf support if requested. r=khuey

Browse Source
This commit is contained in:
Jory A. Pratt 2011-07-08 01:28:48 -07:00
parent 696bb6cdcd
commit c78358bffd
5 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/pref/Makefile.in
View File

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

2
extensions/pref/system-pref/src/Makefile.in
View File

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

2
toolkit/library/libxul-config.mk
View File

@ -260,9 +260,11 @@ endif
ifdef MOZ_ENABLE_GTK2 ifdef MOZ_ENABLE_GTK2
COMPONENT_LIBS += widget_gtk2 COMPONENT_LIBS += widget_gtk2
ifdef MOZ_PREF_EXTENSIONS ifdef MOZ_PREF_EXTENSIONS
ifdef MOZ_ENABLE_GCONF
COMPONENT_LIBS += system-pref COMPONENT_LIBS += system-pref
endif endif
endif endif
endif
ifdef MOZ_ENABLE_GTK2 ifdef MOZ_ENABLE_GTK2
ifdef MOZ_X11 ifdef MOZ_X11

2
toolkit/library/nsStaticXULComponents.cpp
View File

@ -111,12 +111,14 @@
#ifdef MOZ_PREF_EXTENSIONS #ifdef MOZ_PREF_EXTENSIONS
#ifdef MOZ_ENABLE_GTK2 #ifdef MOZ_ENABLE_GTK2
#ifdef MOZ_ENABLE_GCONF
#define SYSTEMPREF_MODULES \ #define SYSTEMPREF_MODULES \
MODULE(nsSystemPrefModule) \ MODULE(nsSystemPrefModule) \
MODULE(nsAutoConfigModule) MODULE(nsAutoConfigModule)
#else #else
#define SYSTEMPREF_MODULES MODULE(nsAutoConfigModule) #define SYSTEMPREF_MODULES MODULE(nsAutoConfigModule)
#endif #endif
#endif
#else #else
#define SYSTEMPREF_MODULES #define SYSTEMPREF_MODULES
#endif #endif

4
widget/src/gtk2/nsWindow.cpp
View File

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