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 09a8a8a..9b524ba 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,5 +1,55 @@
 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]:
         * gsimpleasyncresult.c:
        Rename gioscheduler calls so they all use the g_io_schedule_ prefix.

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 07c9e8c..e5dd24d 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 3d9b4d5..3b7b4f8 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 e7dfd3c..59d6f2f 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 123c20a..640d611 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 8e9c1ea..3eea4f9 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 d47ecd0..134bf82 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 2697914..7c890be 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 e8bbf57..9dcbf14 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 355752d..0ecd14f 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 c5d7043..7a4e405 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 0f667dc..6ed5853 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 4425f7d..5909b5b 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 f36b3c8..6d9e463 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 07d7992..48574b1 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 0c96e99..0d41903 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 ffec2dd..11d04fc 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 e31c42d..18d73d0 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 1614d12..ec48d1e 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 77e7f9f..5f1f891 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 0fb4f2b..5b38f45 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 4fd7734..c7fd383 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 b6982b5..3162722 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 f8e82db..ee6d915 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 124046e..ba2d968 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 b7dab6a..dd02889 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 8966136..3759fec 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 5f4e706..606344d 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 b928a90..f024c09 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 36b6de7..bc2bb67 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 d70e2ad..acc2e1e 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 88f42df..3854259 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 d244912..fd07462 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 56d77bf..e52f23d 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 837fcc8..c413e60 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 3b3b42a..35434fa 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 4977d7d..8626bb1 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 0525349..78b8998 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 f1ab938..f2f9b36 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 b249d35..7c3a204 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 4eeaa41..7bb7cd9 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 1ad6f10..9be6c89 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 83cad9e..bfcf614 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 3abc9b4..9400c6f 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 6c82bf7..02f5bc2 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 787d414..463d56a 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 0780fa2..36d920a 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