# HG changeset patch
# User Jan D. <jan.h.d@swipnet.se>
# Date 1271874313 -7200
# Node ID c10fc3731b2c755b88be040a357c92db7dd76c95
# Parent  c964c5fcf1f25eb3d50fe6f3e73d386c677d2557
* xsettings.c: Move misplaced HAVE_GCONF

diff -r c964c5fcf1f2 -r c10fc3731b2c src/ChangeLog
--- a/src/ChangeLog	Wed Apr 21 20:59:39 2010 +0300
+++ b/src/ChangeLog	Wed Apr 21 20:25:13 2010 +0200
@@ -33,6 +33,7 @@
 	Qtool_bar_style.  Initialize current_tool_bar_style to nil.
 	defsubr Stool_bar_get_system_style. Fprovide on
 	dynamic-setting.
+	Move misplaced HAVE_GCONF
 
 	* xsettings.h (Ftool_bar_get_system_style): Declare.
 
diff -r c964c5fcf1f2 -r c10fc3731b2c src/xsettings.c
--- a/src/xsettings.c	Wed Apr 21 20:59:39 2010 +0300
+++ b/src/xsettings.c	Wed Apr 21 20:25:13 2010 +0200
@@ -68,11 +68,6 @@
 #define XSETTINGS_FONT_NAME       "Gtk/FontName"
 #define XSETTINGS_TOOL_BAR_STYLE  "Gtk/ToolbarStyle"
 
-#ifdef HAVE_GCONF
-
-#define SYSTEM_MONO_FONT     "/desktop/gnome/interface/monospace_font_name"
-#define SYSTEM_FONT          "/desktop/gnome/interface/font_name"
-
 enum {
   SEEN_AA         = 0x01,
   SEEN_HINTING    = 0x02,
@@ -97,6 +92,11 @@
   unsigned seen;
 };
 
+#ifdef HAVE_GCONF
+
+#define SYSTEM_MONO_FONT     "/desktop/gnome/interface/monospace_font_name"
+#define SYSTEM_FONT          "/desktop/gnome/interface/font_name"
+
 /* Callback called when something changed in GConf that we care about,
    that is SYSTEM_MONO_FONT.  */