aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2011-06-30 17:07:40 +0200
committerJan Djärv2011-06-30 17:07:40 +0200
commit51bb811f62f50430c4de8beccbdbdf974fb79e9f (patch)
treef49e3f18d49ba1a6d6d18538c63aaac75a4f3f09 /src
parent68ba37fbd97f96c75a13609a80fd4c1a5b147e3f (diff)
downloademacs-51bb811f62f50430c4de8beccbdbdf974fb79e9f.tar.gz
emacs-51bb811f62f50430c4de8beccbdbdf974fb79e9f.zip
Fix bad include.
* xsettings.c: Include glib-object.h, gio/gio.h if HAVE_GSETTINGS.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xsettings.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index bd00b0f0a5b..dc51a2633ac 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,6 @@
12011-06-30 Jan Djärv <jan.h.d@swipnet.se> 12011-06-30 Jan Djärv <jan.h.d@swipnet.se>
2 2
3 * xsettings.c: Include glib.h if HAVE_GSETTINGS. 3 * xsettings.c: Include glib-object.h, gio/gio.h if HAVE_GSETTINGS.
4 Let HAVE_GSETTINGS override HAVE_GCONF. 4 Let HAVE_GSETTINGS override HAVE_GCONF.
5 (store_monospaced_changed): New function. 5 (store_monospaced_changed): New function.
6 (EMACS_SETTINGS): A new type derived from GObject to handle 6 (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/>. */
34 34
35#include <X11/Xproto.h> 35#include <X11/Xproto.h>
36 36
37#define HAVE_GSETTINGS
38#ifdef HAVE_GSETTINGS 37#ifdef HAVE_GSETTINGS
39#include <glib.h> 38#include <glib-object.h>
39#include <gio/gio.h>
40#else 40#else
41#ifdef HAVE_GCONF 41#ifdef HAVE_GCONF
42#include <gconf/gconf-client.h> 42#include <gconf/gconf-client.h>