[Emacs-diffs] /srv/bzr/emacs/trunk r99980: * xsettings.c: Move misplaced HAVE_GCONF

[Jan D.]

------------------------------------------------------------
revno: 99980
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Wed 2010-04-21 20:25:13 +0200
message:
  * xsettings.c: Move misplaced HAVE_GCONF
modified:
  src/ChangeLog
  src/xsettings.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-21 17:59:39 +0000
+++ b/src/ChangeLog     2010-04-21 18:25:13 +0000
@@ -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.
 

=== modified file 'src/xsettings.c'
--- a/src/xsettings.c   2010-04-20 18:52:07 +0000
+++ b/src/xsettings.c   2010-04-21 18:25:13 +0000
@@ -68,11 +68,6 @@
 #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 @@
   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.  */