* xsettings.c: Move misplaced HAVE_GCONF

diff --git a/src/ChangeLog b/src/ChangeLog
index a9037d64dd9ed612bc618c261732a8e4c9ef87eb..acab6a89e49e6c884a9068fbb24dace1a33d3ef3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/xsettings.c b/src/xsettings.c
index b30e79b904e679d54de5e9f0e090f2a1a52ae3e8..2dd7f70eb60ffa135d178bc07687b30f5acb2696 100644 (file)
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -68,11 +68,6 @@ store_config_changed_event (arg, display_name)
 #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 @@ struct xsettings
   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.  */