* xsettings.c: Move misplaced HAVE_GCONF

31a01b90 · Jan Djärv · 372b7a95 · 31a01b90 · 31a01b90
Commit 31a01b90 authored Apr 21, 2010 by Jan Djärv
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

src/ChangeLog src/ChangeLog +1 -0

src/xsettings.c src/xsettings.c +5 -5

No files found.
--- 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.


--- 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.  */