* xsettings.c (XSETTINGS_FONT_NAME): Move XSETTINGS_FONT_NAME out of HAVE_GCONF.

diff --git a/src/ChangeLog b/src/ChangeLog
index ba7687d7841008f60616d84e930dafa21290e6c6..e32a1bbc99e5057c22f32251f40724d6911a60e4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * xsettings.c (XSETTINGS_FONT_NAME): Move XSETTINGS_FONT_NAME out of
+       HAVE_GCONF.
+
 2010-04-08  Eli Zaretskii  <eliz@gnu.org>
 
        * bidi.c (bidi_resolve_weak): Use prev.type_after_w1, instead of

diff --git a/src/xsettings.c b/src/xsettings.c
index b71871df573f1a78532620dcf6214e8347d405f7..1db7a24ebad08deda462ca73cca26d401c9b4c40 100644 (file)
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -64,11 +64,12 @@ store_font_changed_event (arg, display_name)
   kbd_buffer_store_event (&event);
 }
 
+#define XSETTINGS_FONT_NAME  "Gtk/FontName"
+
 #ifdef HAVE_GCONF
 
 #define SYSTEM_MONO_FONT     "/desktop/gnome/interface/monospace_font_name"
 #define SYSTEM_FONT          "/desktop/gnome/interface/font_name"
-#define XSETTINGS_FONT_NAME  "Gtk/FontName"
 
 /* Callback called when something changed in GConf that we care about,
    that is SYSTEM_MONO_FONT.  */