metacity r4023 - in trunk: . src/core

[tthurman svn gnome org]

Author: tthurman
Date: Sat Nov 22 19:10:50 2008
New Revision: 4023
URL: http://svn.gnome.org/viewvc/metacity?rev=4023&view=rev

Log:
	* src/core/prefs.c: fix two places where there was a warning
	if GConf was turned off.



Modified:
   trunk/ChangeLog
   trunk/src/core/prefs.c

Modified: trunk/src/core/prefs.c
==============================================================================
--- trunk/src/core/prefs.c	(original)
+++ trunk/src/core/prefs.c	Sat Nov 22 19:10:50 2008
@@ -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 @@
 /* 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 @@
   "/desktop/gnome/interface",
   NULL,
 };
+#endif
 
 void
 meta_prefs_init (void)