# HG changeset patch
# User Jan D. <jan.h.d@swipnet.se>
# Date 1270750971 -7200
# Node ID 2311789d488816d650e0a78b3ede2de1b1f1c886
# Parent  ba0339bda07379432dee6c584507dd98ea422259
* xsettings.c (XSETTINGS_FONT_NAME): Move XSETTINGS_FONT_NAME out of HAVE_GCONF.

diff -r ba0339bda073 -r 2311789d4888 src/ChangeLog
--- a/src/ChangeLog	Thu Apr 08 20:35:10 2010 +0300
+++ b/src/ChangeLog	Thu Apr 08 20:22:51 2010 +0200
@@ -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 -r ba0339bda073 -r 2311789d4888 src/xsettings.c
--- a/src/xsettings.c	Thu Apr 08 20:35:10 2010 +0300
+++ b/src/xsettings.c	Thu Apr 08 20:22:51 2010 +0200
@@ -64,11 +64,12 @@
   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.  */