Fix bad include.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index bd00b0f0a5b60ec9ff99672e18cd764e73b90d51..dc51a2633ac0952c130097b0702b4af77de7b5ab 100644 (file)
--- 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 09a5d31d01f94c8d4136e002262dd8458605bc57..5df05e3e50e6ac9c92457a4df28fc0c60268523a 100644 (file)
--- 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>