* xsettings.c: Move misplaced HAVE_GCONF
authorJan Djärv <jan.h.d@swipnet.se>
Wed, 21 Apr 2010 18:25:13 +0000 (20:25 +0200)
committerJan Djärv <jan.h.d@swipnet.se>
Wed, 21 Apr 2010 18:25:13 +0000 (20:25 +0200)
src/ChangeLog
src/xsettings.c

index a9037d6..acab6a8 100644 (file)
@@ -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.
 
index b30e79b..2dd7f70 100644 (file)
@@ -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.  */