Add single-include guards to new headers

As pointed out by Christian Persch in bug 620173, all the new
gdbus and gsettings headers were missing these.

diff --git a/gio/gcredentials.h b/gio/gcredentials.h
index be1965f..e0d8fcd 100644 (file)
--- a/gio/gcredentials.h
+++ b/gio/gcredentials.h
@@ -20,6 +20,10 @@
  * Author: 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_CREDENTIALS_H__
 #define __G_CREDENTIALS_H__
 

diff --git a/gio/gdbusaddress.h b/gio/gdbusaddress.h
index 389bd83..955c39e 100644 (file)
--- a/gio/gdbusaddress.h
+++ b/gio/gdbusaddress.h
@@ -20,6 +20,10 @@
  * Author: 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_DBUS_ADDRESS_H__
 #define __G_DBUS_ADDRESS_H__
 

diff --git a/gio/gdbusauthobserver.h b/gio/gdbusauthobserver.h
index b408365..f5f6385 100644 (file)
--- a/gio/gdbusauthobserver.h
+++ b/gio/gdbusauthobserver.h
@@ -20,6 +20,10 @@
  * Author: 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_DBUS_AUTH_OBSERVER_H__
 #define __G_DBUS_AUTH_OBSERVER_H__
 

diff --git a/gio/gdbusconnection.h b/gio/gdbusconnection.h
index 1055a58..1a9597c 100644 (file)
--- a/gio/gdbusconnection.h
+++ b/gio/gdbusconnection.h
@@ -20,6 +20,10 @@
  * Author: 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_DBUS_CONNECTION_H__
 #define __G_DBUS_CONNECTION_H__
 

diff --git a/gio/gdbuserror.h b/gio/gdbuserror.h
index 1451379..85e2f88 100644 (file)
--- a/gio/gdbuserror.h
+++ b/gio/gdbuserror.h
@@ -20,6 +20,10 @@
  * Author: 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_DBUS_ERROR_H__
 #define __G_DBUS_ERROR_H__
 

diff --git a/gio/gdbusintrospection.h b/gio/gdbusintrospection.h
index 3560ff3..fedfbf7 100644 (file)
--- a/gio/gdbusintrospection.h
+++ b/gio/gdbusintrospection.h
@@ -20,6 +20,10 @@
  * Author: 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_DBUS_INTROSPECTION_H__
 #define __G_DBUS_INTROSPECTION_H__
 

diff --git a/gio/gdbusmessage.h b/gio/gdbusmessage.h
index af3fdfd..f344f09 100644 (file)
--- a/gio/gdbusmessage.h
+++ b/gio/gdbusmessage.h
@@ -20,6 +20,10 @@
  * Author: 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_DBUS_MESSAGE_H__
 #define __G_DBUS_MESSAGE_H__
 

diff --git a/gio/gdbusmethodinvocation.h b/gio/gdbusmethodinvocation.h
index cb1d751..633226e 100644 (file)
--- a/gio/gdbusmethodinvocation.h
+++ b/gio/gdbusmethodinvocation.h
@@ -20,6 +20,10 @@
  * Author: 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_DBUS_METHOD_INVOCATION_H__
 #define __G_DBUS_METHOD_INVOCATION_H__
 

diff --git a/gio/gdbusnameowning.h b/gio/gdbusnameowning.h
index a1adc3f..85921bb 100644 (file)
--- a/gio/gdbusnameowning.h
+++ b/gio/gdbusnameowning.h
@@ -20,6 +20,10 @@
  * Author: 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_DBUS_NAME_OWNING_H__
 #define __G_DBUS_NAME_OWNING_H__
 

diff --git a/gio/gdbusnamewatching.h b/gio/gdbusnamewatching.h
index a424f43..5d410bc 100644 (file)
--- a/gio/gdbusnamewatching.h
+++ b/gio/gdbusnamewatching.h
@@ -20,6 +20,10 @@
  * Author: 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_DBUS_NAME_WATCHING_H__
 #define __G_DBUS_NAME_WATCHING_H__
 

diff --git a/gio/gdbusproxy.h b/gio/gdbusproxy.h
index 4868853..9279353 100644 (file)
--- a/gio/gdbusproxy.h
+++ b/gio/gdbusproxy.h
@@ -20,6 +20,10 @@
  * Author: 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_DBUS_PROXY_H__
 #define __G_DBUS_PROXY_H__
 

diff --git a/gio/gdbusproxywatching.h b/gio/gdbusproxywatching.h
index 37c88dd..3f9ccfb 100644 (file)
--- a/gio/gdbusproxywatching.h
+++ b/gio/gdbusproxywatching.h
@@ -20,6 +20,10 @@
  * Author: 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_DBUS_PROXY_WATCHING_H__
 #define __G_DBUS_PROXY_WATCHING_H__
 

diff --git a/gio/gdbusserver.h b/gio/gdbusserver.h
index 5822b9c..4878848 100644 (file)
--- a/gio/gdbusserver.h
+++ b/gio/gdbusserver.h
@@ -20,6 +20,10 @@
  * Author: 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_DBUS_SERVER_H__
 #define __G_DBUS_SERVER_H__
 

diff --git a/gio/gdbusutils.h b/gio/gdbusutils.h
index 4d8a7ab..b31dc75 100644 (file)
--- a/gio/gdbusutils.h
+++ b/gio/gdbusutils.h
@@ -20,6 +20,10 @@
  * Author: 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_DBUS_UTILS_H__
 #define __G_DBUS_UTILS_H__
 

diff --git a/gio/gsettings.h b/gio/gsettings.h
index 8f0c0a5..4b108b2 100644 (file)
--- a/gio/gsettings.h
+++ b/gio/gsettings.h
@@ -19,6 +19,10 @@
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_SETTINGS_H__
 #define __G_SETTINGS_H__