# HG changeset patch # Parent 2c4a0ac34b335b058bb2e69ccb29099cc2c6dd61 diff --git a/extensions/pref/system-pref/src/Makefile.in b/extensions/pref/system-pref/src/Makefile.in --- a/extensions/pref/system-pref/src/Makefile.in +++ b/extensions/pref/system-pref/src/Makefile.in @@ -52,8 +52,10 @@ ifdef MOZ_ENABLE_GTK2 +ifdef MOZ_ENABLE_GCONF DIRS = gconf endif +endif EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp --- a/widget/src/gtk2/nsWindow.cpp +++ b/widget/src/gtk2/nsWindow.cpp @@ -4217,6 +4217,7 @@ Resize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, PR_FALSE); #ifdef ACCESSIBILITY +#ifdef MOZ_ENABLE_GCONF nsresult rv; if (!sAccessibilityChecked) { sAccessibilityChecked = PR_TRUE; @@ -4238,9 +4239,10 @@ sysPrefService->GetBoolPref(sAccessibilityKey, &sAccessibilityEnabled); } - } } +#endif + if (sAccessibilityEnabled) { LOG(("nsWindow:: Create Toplevel Accessibility\n")); CreateRootAccessible();