[Emacs-diffs] /srv/bzr/emacs/trunk r99852: * xsettings.c (XSETTINGS_FONT_NAME): Move XSETTINGS_FONT_NAME out of HAVE_GCONF.

[Jan D.]

------------------------------------------------------------
revno: 99852
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Thu 2010-04-08 20:22:51 +0200
message:
  * xsettings.c (XSETTINGS_FONT_NAME): Move XSETTINGS_FONT_NAME out of 
HAVE_GCONF.
modified:
  src/ChangeLog
  src/xsettings.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-08 17:35:10 +0000
+++ b/src/ChangeLog     2010-04-08 18:22:51 +0000
@@ -1,3 +1,8 @@
+2010-04-08  Jan Djärv  <address@hidden>
+
+       * xsettings.c (XSETTINGS_FONT_NAME): Move XSETTINGS_FONT_NAME out of
+       HAVE_GCONF.
+
 2010-04-08  Eli Zaretskii  <address@hidden>
 
        * bidi.c (bidi_resolve_weak): Use prev.type_after_w1, instead of

=== modified file 'src/xsettings.c'
--- a/src/xsettings.c   2010-04-08 16:20:32 +0000
+++ b/src/xsettings.c   2010-04-08 18:22:51 +0000
@@ -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.  */