From: Jan Djärv <jan.h.d@swipnet.se>
Date: Thu, 30 Jun 2011 15:07:40 +0000 (+0200)
Subject: Fix bad include.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~311
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=51bb811f62f50430c4de8beccbdbdf974fb79e9f;p=emacs.git

Fix bad include.

* xsettings.c: Include glib-object.h, gio/gio.h if HAVE_GSETTINGS.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index bd00b0f0a5b..dc51a2633ac 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,6 @@
 2011-06-30  Jan Djärv  <jan.h.d@swipnet.se>
 
-	* 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
diff --git a/src/xsettings.c b/src/xsettings.c
index 09a5d31d01f..5df05e3e50e 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -34,9 +34,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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>