diff --git a/ChangeLog b/ChangeLog
index 09193a997..f713ff367 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-22  Thomas Thurman  <tthurman@gnome.org>
+
+	* src/core/prefs.c: fix two places where there was a warning
+	if GConf was turned off.
+
 2008-11-22  Thomas Thurman  <tthurman@gnome.org>
 
         * src/core/all-keybindings.h: "backward", not "backwards" throughout.
diff --git a/src/core/prefs.c b/src/core/prefs.c
index 02f38a272..d0fb1c9c6 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -68,8 +68,8 @@
 static GConfClient *default_client = NULL;
 static GList *changes = NULL;
 static guint changed_idle;
-#endif
 static GList *listeners = NULL;
+#endif
 
 static gboolean use_system_font = FALSE;
 static PangoFontDescription *titlebar_font = NULL;
@@ -976,6 +976,7 @@ meta_prefs_remove_listener (MetaPrefsChangedFunc func,
 /* Initialisation.                                                          */
 /****************************************************************************/
 
+#ifdef HAVE_GCONF
 /* @@@ again, use glib's ability to tell you the size of the array */
 static gchar *gconf_dirs_we_are_interested_in[] = {
   "/apps/metacity",
@@ -985,6 +986,7 @@ static gchar *gconf_dirs_we_are_interested_in[] = {
   "/desktop/gnome/interface",
   NULL,
 };
+#endif
 
 void
 meta_prefs_init (void)