Only allow including <gio/gio.h> from apps

2007-12-14  Alexander Larsson  <alexl@redhat.com>

        * Makefile.am:
        * fam/Makefile.am:
        * gappinfo.h:
        * gasyncresult.h:
        * gbufferedinputstream.h:
        * gbufferedoutputstream.h:
        * gcancellable.h:
        * gcontenttype.h:
        * gdatainputstream.h:
        * gdataoutputstream.h:
        * gdesktopappinfo.h:
        * gdirectorymonitor.h:
        * gdrive.h:
        * gfile.h:
        * gfileattribute.h:
        * gfileenumerator.h:
        * gfileicon.h:
        * gfileinfo.h:
        * gfileinputstream.h:
        * gfilemonitor.h:
        * gfilenamecompleter.h:
        * gfileoutputstream.h:
        * gfilterinputstream.h:
        * gfilteroutputstream.h:
        * gicon.h:
        * ginputstream.h:
        * gio.h:
        * gioerror.h:
        * giomodule.h:
        * gioscheduler.h:
        * gloadableicon.h:
        * gmemoryinputstream.h:
        * gmemoryoutputstream.h:
        * gmount.h:
        * gmountoperation.h:
        * goutputstream.h:
        * gseekable.h:
        * gsimpleasyncresult.h:
        * gthemedicon.h:
        * gunixinputstream.h:
        * gunixmounts.h:
        * gunixoutputstream.h:
        * gvfs.h:
        * gvolume.h:
        * gvolumemonitor.h:
        * inotify/Makefile.am:
	Only allow including <gio/gio.h> from apps

svn path=/trunk/; revision=6117

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 09a8a8a411dded82a2823c8e7fbefbc0ba126257..9b524ba97227592baf32b1890a235247e17d0f22 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,53 @@
+2007-12-14  Alexander Larsson  <alexl@redhat.com>
+
+        * Makefile.am:
+        * fam/Makefile.am:
+        * gappinfo.h:
+        * gasyncresult.h:
+        * gbufferedinputstream.h:
+        * gbufferedoutputstream.h:
+        * gcancellable.h:
+        * gcontenttype.h:
+        * gdatainputstream.h:
+        * gdataoutputstream.h:
+        * gdesktopappinfo.h:
+        * gdirectorymonitor.h:
+        * gdrive.h:
+        * gfile.h:
+        * gfileattribute.h:
+        * gfileenumerator.h:
+        * gfileicon.h:
+        * gfileinfo.h:
+        * gfileinputstream.h:
+        * gfilemonitor.h:
+        * gfilenamecompleter.h:
+        * gfileoutputstream.h:
+        * gfilterinputstream.h:
+        * gfilteroutputstream.h:
+        * gicon.h:
+        * ginputstream.h:
+        * gio.h:
+        * gioerror.h:
+        * giomodule.h:
+        * gioscheduler.h:
+        * gloadableicon.h:
+        * gmemoryinputstream.h:
+        * gmemoryoutputstream.h:
+        * gmount.h:
+        * gmountoperation.h:
+        * goutputstream.h:
+        * gseekable.h:
+        * gsimpleasyncresult.h:
+        * gthemedicon.h:
+        * gunixinputstream.h:
+        * gunixmounts.h:
+        * gunixoutputstream.h:
+        * gvfs.h:
+        * gvolume.h:
+        * gvolumemonitor.h:
+        * inotify/Makefile.am:
+       Only allow including <gio/gio.h> from apps
+
 2007-12-14  Alexander Larsson  <alexl@redhat.com>
 
         * gioscheduler.[ch]:

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 07c9e8c278919eef29845c0650b403869ced1312..e5dd24db814e8ffa80f608c00edec8e7e0a26bd3 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -31,6 +31,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/gmodule                         \
        $(GLIB_DEBUG_FLAGS)                             \
        -DG_DISABLE_DEPRECATED                          \
+       -DGIO_COMPILATION                               \
        -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"  
 
 lib_LTLIBRARIES = libgio-2.0.la

diff --git a/gio/fam/Makefile.am b/gio/fam/Makefile.am
index 3d9b4d5926037bd0df206c932224a4208f5a775b..3b7b4f8b58caf8824c1075106ac508750555000b 100644 (file)
--- a/gio/fam/Makefile.am
+++ b/gio/fam/Makefile.am
@@ -24,6 +24,7 @@ libgiofam_la_CFLAGS = \
        -I$(top_srcdir)/gmodule         \
        -I$(top_srcdir)/gio             \
        -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"  \
+       -DGIO_COMPILATION               \
        -DG_DISABLE_DEPRECATED
 
 libgiofam_la_LDFLAGS = $(module_flags)

diff --git a/gio/gappinfo.h b/gio/gappinfo.h
index e7dfd3cc81cc7b240e4dd8fc3ff1b4b70f14d4ef..59d6f2fbe84c619240b53dd72fb4447e83422c1f 100644 (file)
--- a/gio/gappinfo.h
+++ b/gio/gappinfo.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_APP_INFO_H__
 #define __G_APP_INFO_H__
 

diff --git a/gio/gasyncresult.h b/gio/gasyncresult.h
index 123c20a7bfba1ce2662b3120a29d96ab263b59c3..640d611189dae9106384c42c7a7e40b28d47e7d8 100644 (file)
--- a/gio/gasyncresult.h
+++ b/gio/gasyncresult.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_ASYNC_RESULT_H__
 #define __G_ASYNC_RESULT_H__
 

diff --git a/gio/gbufferedinputstream.h b/gio/gbufferedinputstream.h
index 8e9c1ea9f998a16733a64025b376bb7d159b9066..3eea4f9bf6ae8dc181da7b234af62a35a3bd4af2 100644 (file)
--- a/gio/gbufferedinputstream.h
+++ b/gio/gbufferedinputstream.h
@@ -20,6 +20,10 @@
  * Author: Christian Kellner <gicmo@gnome.org> 
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_BUFFERED_INPUT_STREAM_H__
 #define __G_BUFFERED_INPUT_STREAM_H__
 

diff --git a/gio/gbufferedoutputstream.h b/gio/gbufferedoutputstream.h
index d47ecd0fce22b9e5a1220ce0763de4657e470597..134bf82829f08cc16fdfacc7b6f9ff89395af9c1 100644 (file)
--- a/gio/gbufferedoutputstream.h
+++ b/gio/gbufferedoutputstream.h
@@ -20,6 +20,10 @@
  * Author: Christian Kellner <gicmo@gnome.org> 
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_BUFFERED_OUTPUT_STREAM_H__
 #define __G_BUFFERED_OUTPUT_STREAM_H__
 

diff --git a/gio/gcancellable.h b/gio/gcancellable.h
index 2697914e5f06253b61dadf4ca8debbd6189afee6..7c890be9c2d079de785a9982b41b3b8f43b5b94d 100644 (file)
--- a/gio/gcancellable.h
+++ b/gio/gcancellable.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_CANCELLABLE_H__
 #define __G_CANCELLABLE_H__
 

diff --git a/gio/gcontenttype.h b/gio/gcontenttype.h
index e8bbf57805b799a08f38093381259e4847826141..9dcbf149c4d24d4743f3a69dd911b0233786ccbe 100644 (file)
--- a/gio/gcontenttype.h
+++ b/gio/gcontenttype.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_CONTENT_TYPE_H__
 #define __G_CONTENT_TYPE_H__
 

diff --git a/gio/gdatainputstream.h b/gio/gdatainputstream.h
index 355752d2bc3a04f0cc52eac5571201b669c1e45b..0ecd14f5b6e9045e70f0ce83fb61c19830145b4e 100644 (file)
--- a/gio/gdatainputstream.h
+++ b/gio/gdatainputstream.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_DATA_INPUT_STREAM_H__
 #define __G_DATA_INPUT_STREAM_H__
 

diff --git a/gio/gdataoutputstream.h b/gio/gdataoutputstream.h
index c5d7043708557d78e96a59dfbb03ec3edfeaae92..7a4e405574ebd3d2b8e927cce1c2b9dda8d11ee5 100644 (file)
--- a/gio/gdataoutputstream.h
+++ b/gio/gdataoutputstream.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_DATA_OUTPUT_STREAM_H__
 #define __G_DATA_OUTPUT_STREAM_H__
 

diff --git a/gio/gdesktopappinfo.h b/gio/gdesktopappinfo.h
index 0f667dca37114aa1b2294518574ea6633fddd9ac..6ed5853fa65147c784f1e1c59fcc805234bc6664 100644 (file)
--- a/gio/gdesktopappinfo.h
+++ b/gio/gdesktopappinfo.h
@@ -23,7 +23,7 @@
 #ifndef __G_DESKTOP_APP_INFO_H__
 #define __G_DESKTOP_APP_INFO_H__
 
-#include <gio/gappinfo.h>
+#include <gio/gio.h>
 
 G_BEGIN_DECLS
 

diff --git a/gio/gdirectorymonitor.h b/gio/gdirectorymonitor.h
index 4425f7dd9d26eca37dfe32d10d69d4ca487997f0..5909b5b78a8cf04e7a0d073d339677192656f0d0 100644 (file)
--- a/gio/gdirectorymonitor.h
+++ b/gio/gdirectorymonitor.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_DIRECTORY_MONITOR_H__
 #define __G_DIRECTORY_MONITOR_H__
 

diff --git a/gio/gdrive.h b/gio/gdrive.h
index f36b3c86b30a0eb6475bb6ec41e1d3dc2d11838f..6d9e46310b03d485a6615624d64d0dfa9236eeff 100644 (file)
--- a/gio/gdrive.h
+++ b/gio/gdrive.h
@@ -21,6 +21,10 @@
  *         David Zeuthen <davidz@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_DRIVE_H__
 #define __G_DRIVE_H__
 

diff --git a/gio/gfile.h b/gio/gfile.h
index 07d799274cd4186a3b36f4790902c614014d08b1..48574b1e96c421d926caa45b24738a811734af87 100644 (file)
--- a/gio/gfile.h
+++ b/gio/gfile.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_FILE_H__
 #define __G_FILE_H__
 

diff --git a/gio/gfileattribute.h b/gio/gfileattribute.h
index 0c96e99a18bca751a9ca4833bef16df0d861b39e..0d419035a6d0f30964663666ce5ad54cda0dc215 100644 (file)
--- a/gio/gfileattribute.h
+++ b/gio/gfileattribute.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_FILE_ATTRIBUTE_H__
 #define __G_FILE_ATTRIBUTE_H__
 

diff --git a/gio/gfileenumerator.h b/gio/gfileenumerator.h
index ffec2dd78c261e31833f26da06c269ecbba80e6f..11d04fc46c446c260e4d6f03fb0fc5f584761df0 100644 (file)
--- a/gio/gfileenumerator.h
+++ b/gio/gfileenumerator.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_FILE_ENUMERATOR_H__
 #define __G_FILE_ENUMERATOR_H__
 

diff --git a/gio/gfileicon.h b/gio/gfileicon.h
index e31c42d096188fd6f672ad77c48e48a3ec0f1fba..18d73d0d03b67852fac3c27ce711a0a0ebbe721b 100644 (file)
--- a/gio/gfileicon.h
+++ b/gio/gfileicon.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_FILE_ICON_H__
 #define __G_FILE_ICON_H__
 

diff --git a/gio/gfileinfo.h b/gio/gfileinfo.h
index 1614d125d47236b5f4372bd876f3685a0a1eff0c..ec48d1e74386f35a2bf05791350538e7931e120c 100644 (file)
--- a/gio/gfileinfo.h
+++ b/gio/gfileinfo.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_FILE_INFO_H__
 #define __G_FILE_INFO_H__
 

diff --git a/gio/gfileinputstream.h b/gio/gfileinputstream.h
index 77e7f9f8dc175e5c6b00b21add0faa9f3976f186..5f1f8910058735f07ee1fc9d09b0f607f7f9a4a3 100644 (file)
--- a/gio/gfileinputstream.h
+++ b/gio/gfileinputstream.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_FILE_INPUT_STREAM_H__
 #define __G_FILE_INPUT_STREAM_H__
 

diff --git a/gio/gfilemonitor.h b/gio/gfilemonitor.h
index 0fb4f2bb767a0eddc622ef5b4826559891f302c8..5b38f457e7d0adbc7831c0dfff5fa3fa73f0504a 100644 (file)
--- a/gio/gfilemonitor.h
+++ b/gio/gfilemonitor.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_FILE_MONITOR_H__
 #define __G_FILE_MONITOR_H__
 

diff --git a/gio/gfilenamecompleter.h b/gio/gfilenamecompleter.h
index 4fd773458b3bb32cba750878172c660baf4d9efa..c7fd38356a5ec3cdd1635f506f45610dac2e966d 100644 (file)
--- a/gio/gfilenamecompleter.h
+++ b/gio/gfilenamecompleter.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_FILENAME_COMPLETER_H__
 #define __G_FILENAME_COMPLETER_H__
 

diff --git a/gio/gfileoutputstream.h b/gio/gfileoutputstream.h
index b6982b51a138496dd924fbe7a920444adcc6b281..31627226dabfb23e69387c3b5a2086709a8a845d 100644 (file)
--- a/gio/gfileoutputstream.h
+++ b/gio/gfileoutputstream.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_FILE_OUTPUT_STREAM_H__
 #define __G_FILE_OUTPUT_STREAM_H__
 

diff --git a/gio/gfilterinputstream.h b/gio/gfilterinputstream.h
index f8e82db411934810695f6ba105a4f2484c834c14..ee6d915253fdc9a0cf8cfc3cdd353706854d685e 100644 (file)
--- a/gio/gfilterinputstream.h
+++ b/gio/gfilterinputstream.h
@@ -20,6 +20,10 @@
  * Author: Christian Kellner <gicmo@gnome.org> 
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_FILTER_INPUT_STREAM_H__
 #define __G_FILTER_INPUT_STREAM_H__
 

diff --git a/gio/gfilteroutputstream.h b/gio/gfilteroutputstream.h
index 124046ec11396640f8891622b6d96db3c154bd3f..ba2d968e700d029c1195117d80d04dbe29f75b7e 100644 (file)
--- a/gio/gfilteroutputstream.h
+++ b/gio/gfilteroutputstream.h
@@ -20,6 +20,10 @@
  * Author: Christian Kellner <gicmo@gnome.org> 
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_FILTER_OUTPUT_STREAM_H__
 #define __G_FILTER_OUTPUT_STREAM_H__
 

diff --git a/gio/gicon.h b/gio/gicon.h
index b7dab6a878b7710f1f5fe16d4446234f139360db..dd028899a37e2137ee4621b0814d9ac23ec598dd 100644 (file)
--- a/gio/gicon.h
+++ b/gio/gicon.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_ICON_H__
 #define __G_ICON_H__
 

diff --git a/gio/ginputstream.h b/gio/ginputstream.h
index 8966136d6246bb806611bd5f9b90beb1eabc709a..3759fec776f9320731f404adbeaaee152fce4398 100644 (file)
--- a/gio/ginputstream.h
+++ b/gio/ginputstream.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_INPUT_STREAM_H__
 #define __G_INPUT_STREAM_H__
 

diff --git a/gio/gio.h b/gio/gio.h
index 5f4e7060de959b63c5b571bfaf10b68b964dc687..606344ddd62b42d592ef276ef31abee8afe723e0 100644 (file)
--- a/gio/gio.h
+++ b/gio/gio.h
@@ -23,6 +23,8 @@
 #ifndef __G_IO_H__
 #define __G_IO_H__
 
+#define __GIO_GIO_H_INSIDE__
+
 #include <gio/gvfs.h>
 #include <gio/gfile.h>
 #include <gio/gvolumemonitor.h>
@@ -49,4 +51,6 @@
 #include <gio/gsimpleasyncresult.h>
 #include <gio/gioenumtypes.h>
 
+#undef __GIO_GIO_H_INSIDE__
+
 #endif /* __G_IO_H__ */

diff --git a/gio/gioerror.h b/gio/gioerror.h
index b928a9026d74c5e511a27235ddaada00204a2f8b..f024c09ba28aa0454dbb99e6be4ee3637c6f0e83 100644 (file)
--- a/gio/gioerror.h
+++ b/gio/gioerror.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_IO_ERROR_H__
 #define __G_IO_ERROR_H__
 

diff --git a/gio/giomodule.h b/gio/giomodule.h
index 36b6de7a6b74d305c431eb8be9dc690826f54ea2..bc2bb6725a520b18e341e704de30d5f2e891234b 100644 (file)
--- a/gio/giomodule.h
+++ b/gio/giomodule.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_IO_MODULE_H__
 #define __G_IO_MODULE_H__
 

diff --git a/gio/gioscheduler.h b/gio/gioscheduler.h
index d70e2ad905b803bb757ab5a22e54a7ceac5c75b3..acc2e1e6e444268a544e337737547589f1224474 100644 (file)
--- a/gio/gioscheduler.h
+++ b/gio/gioscheduler.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_IO_SCHEDULER_H__
 #define __G_IO_SCHEDULER_H__
 

diff --git a/gio/gloadableicon.h b/gio/gloadableicon.h
index 88f42df85b1e63ce6de6a7b3c08db43bd7947d2c..3854259d9675155a725849041c09a98249119e93 100644 (file)
--- a/gio/gloadableicon.h
+++ b/gio/gloadableicon.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_LOADABLE_ICON_H__
 #define __G_LOADABLE_ICON_H__
 

diff --git a/gio/gmemoryinputstream.h b/gio/gmemoryinputstream.h
index d2449122c2f512a7bb0b7eb943fa7ae4b3556bd4..fd07462ebc96cabbb3b99bf06f8c580dae0b443f 100644 (file)
--- a/gio/gmemoryinputstream.h
+++ b/gio/gmemoryinputstream.h
@@ -20,6 +20,10 @@
  * Author: Christian Kellner <gicmo@gnome.org> 
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_MEMORY_INPUT_STREAM_H__
 #define __G_MEMORY_INPUT_STREAM_H__
 

diff --git a/gio/gmemoryoutputstream.h b/gio/gmemoryoutputstream.h
index 56d77bf51b6f7ab88f92d88826e4e13c4541d7e6..e52f23db3707ee8927e6e94e2f14894303200e1e 100644 (file)
--- a/gio/gmemoryoutputstream.h
+++ b/gio/gmemoryoutputstream.h
@@ -20,6 +20,10 @@
  * Author: Christian Kellner <gicmo@gnome.org> 
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_MEMORY_OUTPUT_STREAM_H__
 #define __G_MEMORY_OUTPUT_STREAM_H__
 

diff --git a/gio/gmount.h b/gio/gmount.h
index 837fcc856a1956e1f25009b3b07511bdd3bee646..c413e60139962588cd92055cb8c8243cdc785dc9 100644 (file)
--- a/gio/gmount.h
+++ b/gio/gmount.h
@@ -21,6 +21,10 @@
  *         David Zeuthen <davidz@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_MOUNT_H__
 #define __G_MOUNT_H__
 

diff --git a/gio/gmountoperation.h b/gio/gmountoperation.h
index 3b3b42a6f4a5d805e77e8a6568eebcbb7c0ff46e..35434fa1632614dad2b440560efd5df48940e22c 100644 (file)
--- a/gio/gmountoperation.h
+++ b/gio/gmountoperation.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_MOUNT_OPERATION_H__
 #define __G_MOUNT_OPERATION_H__
 

diff --git a/gio/goutputstream.h b/gio/goutputstream.h
index 4977d7dc671adab00c11a5ffe781a47a2e060152..8626bb1d6f619cd58b18d3b902f73c2345d5e017 100644 (file)
--- a/gio/goutputstream.h
+++ b/gio/goutputstream.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_OUTPUT_STREAM_H__
 #define __G_OUTPUT_STREAM_H__
 

diff --git a/gio/gseekable.h b/gio/gseekable.h
index 05253490381ece502ec9e969a5f8e4d1fb8c34a9..78b8998c0af2b4e57ef39e64b72756abd92bae15 100644 (file)
--- a/gio/gseekable.h
+++ b/gio/gseekable.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_SEEKABLE_H__
 #define __G_SEEKABLE_H__
 

diff --git a/gio/gsimpleasyncresult.h b/gio/gsimpleasyncresult.h
index f1ab938fe531f72c3311a63a4ec3297ab162b085..f2f9b36d2870d83e1bddce3d5fe8a16c553ed075 100644 (file)
--- a/gio/gsimpleasyncresult.h
+++ b/gio/gsimpleasyncresult.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_SIMPLE_ASYNC_RESULT_H__
 #define __G_SIMPLE_ASYNC_RESULT_H__
 

diff --git a/gio/gthemedicon.h b/gio/gthemedicon.h
index b249d3565729753aad501c1d2f37a5bf57e89cda..7c3a204ddd345f206b41ad4f4dc4c9c55f58f05b 100644 (file)
--- a/gio/gthemedicon.h
+++ b/gio/gthemedicon.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_THEMED_ICON_H__
 #define __G_THEMED_ICON_H__
 

diff --git a/gio/gunixinputstream.h b/gio/gunixinputstream.h
index 4eeaa416663f0d484e206babfb6b1c2607cb4284..7bb7cd96872d771627cbb7608a7061f996e8404c 100644 (file)
--- a/gio/gunixinputstream.h
+++ b/gio/gunixinputstream.h
@@ -23,7 +23,7 @@
 #ifndef __G_UNIX_INPUT_STREAM_H__
 #define __G_UNIX_INPUT_STREAM_H__
 
-#include <gio/ginputstream.h>
+#include <gio/gio.h>
 
 G_BEGIN_DECLS
 

diff --git a/gio/gunixmounts.h b/gio/gunixmounts.h
index 1ad6f10ca9fc32a3017f01d04dee8dd8ec42748f..9be6c89ece93b2c0a24634a223a71edce6d45544 100644 (file)
--- a/gio/gunixmounts.h
+++ b/gio/gunixmounts.h
@@ -23,9 +23,7 @@
 #ifndef __G_UNIX_MOUNTS_H__
 #define __G_UNIX_MOUNTS_H__
 
-#include <glib.h>
-#include <glib-object.h>
-#include <gio/gicon.h>
+#include <gio/gio.h>
 
 G_BEGIN_DECLS
 

diff --git a/gio/gunixoutputstream.h b/gio/gunixoutputstream.h
index 83cad9e8a0b89f01f9c9ca0f536b81aee49a98d3..bfcf614d74db214f58588bfc134f5e652abdd035 100644 (file)
--- a/gio/gunixoutputstream.h
+++ b/gio/gunixoutputstream.h
@@ -23,7 +23,7 @@
 #ifndef __G_UNIX_OUTPUT_STREAM_H__
 #define __G_UNIX_OUTPUT_STREAM_H__
 
-#include <gio/goutputstream.h>
+#include <gio/gio.h>
 
 G_BEGIN_DECLS
 

diff --git a/gio/gvfs.h b/gio/gvfs.h
index 3abc9b425ad33ef776b678a856d875e74c48f6d7..9400c6fb3f6b218e9e2d2e69509ad0de959aeeee 100644 (file)
--- a/gio/gvfs.h
+++ b/gio/gvfs.h
@@ -20,6 +20,10 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_VFS_H__
 #define __G_VFS_H__
 

diff --git a/gio/gvolume.h b/gio/gvolume.h
index 6c82bf7dd97b9a900da3bc37c3718cae0763f07b..02f5bc27736842306e467c078c6020773ee57e5d 100644 (file)
--- a/gio/gvolume.h
+++ b/gio/gvolume.h
@@ -21,6 +21,10 @@
  *         David Zeuthen <davidz@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_VOLUME_H__
 #define __G_VOLUME_H__
 

diff --git a/gio/gvolumemonitor.h b/gio/gvolumemonitor.h
index 787d414ca7101bf131022ede75dd7cb7db191fd1..463d56ac39fdcd82aee8cd0e333bdee794014ec0 100644 (file)
--- a/gio/gvolumemonitor.h
+++ b/gio/gvolumemonitor.h
@@ -21,6 +21,10 @@
  *         David Zeuthen <davidz@redhat.com>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_VOLUME_MONITOR_H__
 #define __G_VOLUME_MONITOR_H__
 

diff --git a/gio/inotify/Makefile.am b/gio/inotify/Makefile.am
index 0780fa278c0e5e85df2cec49817fb6c0cac88152..36d920aacd88b41efe8877a4fc414f60bbc48051 100644 (file)
--- a/gio/inotify/Makefile.am
+++ b/gio/inotify/Makefile.am
@@ -32,5 +32,6 @@ libinotify_la_CFLAGS = \
        -I$(top_srcdir)/gmodule         \
        -I$(top_srcdir)/gio             \
        -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"  \
+       -DGIO_COMPILATION               \
        -DG_DISABLE_DEPRECATED