[Emacs-diffs] /srv/bzr/emacs/trunk r104812: Fix bad include.

[Jan D.]

------------------------------------------------------------
revno: 104812
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Thu 2011-06-30 17:07:40 +0200
message:
  Fix bad include.
  
  * xsettings.c: Include glib-object.h, gio/gio.h if HAVE_GSETTINGS.
modified:
  src/ChangeLog
  src/xsettings.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-06-30 14:00:26 +0000
+++ b/src/ChangeLog     2011-06-30 15:07:40 +0000
@@ -1,6 +1,6 @@
 2011-06-30  Jan Djärv  <address@hidden>
 
-       * xsettings.c: Include glib.h if HAVE_GSETTINGS.
+       * xsettings.c: Include glib-object.h, gio/gio.h if HAVE_GSETTINGS.
        Let HAVE_GSETTINGS override HAVE_GCONF.
        (store_monospaced_changed): New function.
        (EMACS_SETTINGS): A new type derived from GObject to handle

=== modified file 'src/xsettings.c'
--- a/src/xsettings.c   2011-06-30 14:00:26 +0000
+++ b/src/xsettings.c   2011-06-30 15:07:40 +0000
@@ -34,9 +34,9 @@
 
 #include <X11/Xproto.h>
 
-#define HAVE_GSETTINGS
 #ifdef HAVE_GSETTINGS
-#include <glib.h>
+#include <glib-object.h>
+#include <gio/gio.h>
 #else
 #ifdef HAVE_GCONF
 #include <gconf/gconf-client.h>