Attachment #273871 for bug #360307

Lines 46-52 Link Here

(-)a/extensions/pref/Makefile.in (+2 lines)
46	DIRS = autoconfig	46	DIRS = autoconfig
47		47
48	ifdef MOZ_ENABLE_GTK2	48	ifdef MOZ_ENABLE_GTK2
		49	ifdef MOZ_ENABLE_GCONF
49	DIRS += system-pref	50	DIRS += system-pref
50	endif	51	endif
		52	endif
51		53
52	include $(topsrcdir)/config/rules.mk	54	include $(topsrcdir)/config/rules.mk

Lines 52-59 Link Here

(-)a/extensions/pref/system-pref/src/Makefile.in (+2 lines)
52		52
53		53
54	ifdef MOZ_ENABLE_GTK2	54	ifdef MOZ_ENABLE_GTK2
		55	ifdef MOZ_ENABLE_GCONF
55	DIRS = gconf	56	DIRS = gconf
56	endif	57	endif
		58	endif
57		59
58	EXTRA_DSO_LDOPTS = \	60	EXTRA_DSO_LDOPTS = \
59	-L$(DIST)/bin \	61	-L$(DIST)/bin \

Lines 264-272 Link Here

(-)a/toolkit/library/libxul-config.mk (+2 lines)
264	ifdef MOZ_ENABLE_GTK2	264	ifdef MOZ_ENABLE_GTK2
265	COMPONENT_LIBS += widget_gtk2	265	COMPONENT_LIBS += widget_gtk2
266	ifdef MOZ_PREF_EXTENSIONS	266	ifdef MOZ_PREF_EXTENSIONS
		267	ifdef MOZ_ENABLE_GCONF
267	COMPONENT_LIBS += system-pref	268	COMPONENT_LIBS += system-pref
268	endif	269	endif
269	endif	270	endif
		271	endif
270		272
271	ifdef MOZ_ENABLE_GTK2	273	ifdef MOZ_ENABLE_GTK2
272	ifdef MOZ_X11	274	ifdef MOZ_X11





#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

Lines 4217-4222 Link Here

(-)a/widget/src/gtk2/nsWindow.cpp (-1 / +3 lines)
4217	Resize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, PR_FALSE);	4217	Resize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, PR_FALSE);
4218		4218
4219	#ifdef ACCESSIBILITY	4219	#ifdef ACCESSIBILITY
		4220	#ifdef MOZ_ENABLE_GCONF
4220	nsresult rv;	4221	nsresult rv;
4221	if (!sAccessibilityChecked) {	4222	if (!sAccessibilityChecked) {
4222	sAccessibilityChecked = PR_TRUE;	4223	sAccessibilityChecked = PR_TRUE;
Lines 4238-4246 Link Here
4238	sysPrefService->GetBoolPref(sAccessibilityKey,	4239	sysPrefService->GetBoolPref(sAccessibilityKey,
4239	&sAccessibilityEnabled);	4240	&sAccessibilityEnabled);
4240	}	4241	}
4241
4242	}	4242	}
4243	}	4243	}
		4244	#endif
		4245
4244	if (sAccessibilityEnabled) {	4246	if (sAccessibilityEnabled) {
4245	LOG(("nsWindow:: Create Toplevel Accessibility\n"));	4247	LOG(("nsWindow:: Create Toplevel Accessibility\n"));
4246	CreateRootAccessible();	4248	CreateRootAccessible();

Return to bug 360307

Lines 111-122 Link Here

(-)a/toolkit/library/nsStaticXULComponents.cpp (+2 lines)
111		111
112	#ifdef MOZ_PREF_EXTENSIONS	112	#ifdef MOZ_PREF_EXTENSIONS
113	#ifdef MOZ_ENABLE_GTK2	113	#ifdef MOZ_ENABLE_GTK2
		114	#ifdef MOZ_ENABLE_GCONF
114	#define SYSTEMPREF_MODULES \	115	#define SYSTEMPREF_MODULES \
115	MODULE(nsSystemPrefModule) \	116	MODULE(nsSystemPrefModule) \
116	MODULE(nsAutoConfigModule)	117	MODULE(nsAutoConfigModule)
117	#else	118	#else
118	#define SYSTEMPREF_MODULES MODULE(nsAutoConfigModule)	119	#define SYSTEMPREF_MODULES MODULE(nsAutoConfigModule)
119	#endif	120	#endif
		121	#endif
120	#else	122	#else
121	#define SYSTEMPREF_MODULES	123	#define SYSTEMPREF_MODULES
122	#endif	124	#endif