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

0269ef77 · Jan Djärv · 5930fe97 · 0269ef77 · 0269ef77
Commit 0269ef77 authored Apr 08, 2010 by Jan Djärv
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

src/ChangeLog src/ChangeLog +5 -0

src/xsettings.c src/xsettings.c +2 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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

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