summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2010-06-04 23:02:44 +0200
committerRyan Lortie <desrt@desrt.ca>2010-06-04 23:02:44 +0200
commit95c564cabe2837be56f2cf3901a4d6d9d84ab6c9 (patch)
tree1884c9ee3a4a1b23bbb4accc28c8b754e76b21d7
parent473348817809f7aed492245469092901d28de91d (diff)
gsettingsbackend.h: pretend to be gio.h
Since #include <gsettingsbackend.h> is a perfectly valid thing for applications to do, and since we want to include gio headers from gsettingsbackend.h, we need to effectively disable the #error we would get from those headers (because we're not coming via gio.h). We don't want to #include <gio/gio.h> here because this would cause needless rebuilding of GSettingsBackend, GSettings, GDelayedSettingsBackend, etc... every time someone changed anything in any public header.
-rw-r--r--gio/gsettingsbackend.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/gio/gsettingsbackend.h b/gio/gsettingsbackend.h
index b454b42ca..23b937101 100644
--- a/gio/gsettingsbackend.h
+++ b/gio/gsettingsbackend.h
@@ -28,7 +28,9 @@
#error "You must define G_SETTINGS_ENABLE_BACKEND before including <gio/gsettingsbackend.h>."
#endif
-#include <glib-object.h>
+#define __GIO_GIO_H_INSIDE__
+#include <gio/giotypes.h>
+#undef __GIO_GIO_H_INSIDE__
G_BEGIN_DECLS