mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 23:35:34 +00:00
Bug 645793 - Finish disabling gconf support if requested. r=khuey
This commit is contained in:
parent
696bb6cdcd
commit
c78358bffd
@ -46,7 +46,9 @@ 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
|
||||
|
@ -52,8 +52,10 @@ LIBXUL_LIBRARY = 1
|
||||
|
||||
|
||||
ifdef MOZ_ENABLE_GTK2
|
||||
ifdef MOZ_ENABLE_GCONF
|
||||
DIRS = gconf
|
||||
endif
|
||||
endif
|
||||
|
||||
CPPSRCS = \
|
||||
nsSystemPref.cpp \
|
||||
|
@ -260,9 +260,11 @@ 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
|
||||
|
@ -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
|
||||
|
@ -4229,6 +4229,7 @@ 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;
|
||||
@ -4250,11 +4251,12 @@ nsWindow::Create(nsIWidget *aParent,
|
||||
sysPrefService->GetBoolPref(sAccessibilityKey,
|
||||
&sAccessibilityEnabled);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_DFB
|
||||
if (!mDFB) {
|
||||
DirectFBCreate( &mDFB );
|
||||
|
Loading…
Reference in New Issue
Block a user