Attachment 62530 Details for Bug 49384 – Add single-include #error in all headers included from telepathy-glib(-dbus).h

[patch] Add single-include #error in all headers included from telepathy-glib(-dbus).h

Add-single-include-error-in-all-headers-included-f.patch (text/plain), 67.24 KB, created by Xavier Claessens on 2012-06-04 10:35:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xavier Claessens

Created: 2012-06-04 10:35:43 UTC

Size: 67.24 KB

patch

obsolete

>From c373867a7979c956d0accc7e75906a32ace5e23b Mon Sep 17 00:00:00 2001
>From: Xavier Claessens <xavier.claessens@collabora.co.uk>
>Date: Wed, 30 May 2012 11:34:17 +0200
>Subject: [PATCH] Add single-include #error in all headers included from
> telepathy-glib(-dbus).h
>
>https://bugs.freedesktop.org/show_bug.cgi?id=49384
>---
> telepathy-glib/account-channel-request.h        |    4 ++++
> telepathy-glib/account-manager.h                |    4 ++++
> telepathy-glib/account-request.h                |    4 ++++
> telepathy-glib/account.h                        |    4 ++++
> telepathy-glib/add-dispatch-operation-context.h |    4 ++++
> telepathy-glib/automatic-client-factory.h       |    4 ++++
> telepathy-glib/automatic-proxy-factory.h        |    4 ++++
> telepathy-glib/base-call-channel.h              |    4 ++++
> telepathy-glib/base-call-content.h              |    4 ++++
> telepathy-glib/base-call-stream.h               |    4 ++++
> telepathy-glib/base-channel.h                   |    4 ++++
> telepathy-glib/base-client.h                    |    4 ++++
> telepathy-glib/base-connection-manager.h        |    4 ++++
> telepathy-glib/base-connection.h                |    4 ++++
> telepathy-glib/base-contact-list.h              |    4 ++++
> telepathy-glib/base-media-call-channel.h        |    4 ++++
> telepathy-glib/base-media-call-content.h        |    4 ++++
> telepathy-glib/base-media-call-stream.h         |    4 ++++
> telepathy-glib/base-password-channel.h          |    4 ++++
> telepathy-glib/base-protocol.h                  |    4 ++++
> telepathy-glib/base-room-config.h               |    4 ++++
> telepathy-glib/basic-proxy-factory.h            |    4 ++++
> telepathy-glib/call-channel.h                   |    4 ++++
> telepathy-glib/call-content-media-description.h |    4 ++++
> telepathy-glib/call-content.h                   |    4 ++++
> telepathy-glib/call-misc.h                      |    4 ++++
> telepathy-glib/call-stream-endpoint.h           |    4 ++++
> telepathy-glib/call-stream.h                    |    4 ++++
> telepathy-glib/capabilities.h                   |    4 ++++
> telepathy-glib/channel-dispatch-operation.h     |    4 ++++
> telepathy-glib/channel-dispatcher.h             |    4 ++++
> telepathy-glib/channel-iface.h                  |    4 ++++
> telepathy-glib/channel-manager.h                |    4 ++++
> telepathy-glib/channel-request.h                |    4 ++++
> telepathy-glib/channel.h                        |    4 ++++
> telepathy-glib/client-channel-factory.h         |    4 ++++
> telepathy-glib/client-message.h                 |    4 ++++
> telepathy-glib/client.h                         |    4 ++++
> telepathy-glib/cm-message.h                     |    4 ++++
> telepathy-glib/connection-contact-list.h        |    4 ++++
> telepathy-glib/connection-manager.h             |    4 ++++
> telepathy-glib/connection.h                     |    4 ++++
> telepathy-glib/contact-operations.h             |    4 ++++
> telepathy-glib/contact-search-result.h          |    4 ++++
> telepathy-glib/contact-search.h                 |    4 ++++
> telepathy-glib/contact.h                        |    4 ++++
> telepathy-glib/contacts-mixin.h                 |    4 ++++
> telepathy-glib/dbus-properties-mixin.h          |    4 ++++
> telepathy-glib/dbus-tube-channel.h              |    4 ++++
> telepathy-glib/dbus.h                           |    4 ++++
> telepathy-glib/debug-client.h                   |    4 ++++
> telepathy-glib/debug-message.h                  |    3 +++
> telepathy-glib/debug-sender.h                   |    4 ++++
> telepathy-glib/debug.h                          |    4 ++++
> telepathy-glib/defs.h                           |    4 ++++
> telepathy-glib/dtmf.h                           |    4 ++++
> telepathy-glib/enums.h                          |    4 ++++
> telepathy-glib/errors.h                         |    4 ++++
> telepathy-glib/exportable-channel.h             |    4 ++++
> telepathy-glib/file-transfer-channel.h          |    4 ++++
> telepathy-glib/gnio-util.h                      |    4 ++++
> telepathy-glib/group-mixin.h                    |    4 ++++
> telepathy-glib/gtypes.h                         |    4 ++++
> telepathy-glib/handle-channels-context.h        |    4 ++++
> telepathy-glib/handle-repo-dynamic.h            |    4 ++++
> telepathy-glib/handle-repo-static.h             |    4 ++++
> telepathy-glib/handle-repo.h                    |    4 ++++
> telepathy-glib/handle.h                         |    4 ++++
> telepathy-glib/heap.h                           |    4 ++++
> telepathy-glib/interfaces.h                     |    4 ++++
> telepathy-glib/intset.h                         |    4 ++++
> telepathy-glib/media-interfaces.h               |    4 ++++
> telepathy-glib/message-mixin.h                  |    4 ++++
> telepathy-glib/message.h                        |    4 ++++
> telepathy-glib/observe-channels-context.h       |    4 ++++
> telepathy-glib/presence-mixin.h                 |    4 ++++
> telepathy-glib/protocol.h                       |    4 ++++
> telepathy-glib/proxy.h                          |    4 ++++
> telepathy-glib/room-info.h                      |    4 ++++
> telepathy-glib/room-list.h                      |    4 ++++
> telepathy-glib/run.h                            |    4 ++++
> telepathy-glib/signalled-message.h              |    4 ++++
> telepathy-glib/simple-approver.h                |    4 ++++
> telepathy-glib/simple-client-factory.h          |    4 ++++
> telepathy-glib/simple-handler.h                 |    4 ++++
> telepathy-glib/simple-observer.h                |    4 ++++
> telepathy-glib/simple-password-manager.h        |    4 ++++
> telepathy-glib/stream-tube-channel.h            |    4 ++++
> telepathy-glib/stream-tube-connection.h         |    4 ++++
> telepathy-glib/svc-account-manager.h            |    4 ++++
> telepathy-glib/svc-account.h                    |    4 ++++
> telepathy-glib/svc-call.h                       |    4 ++++
> telepathy-glib/svc-channel-dispatch-operation.h |    4 ++++
> telepathy-glib/svc-channel-dispatcher.h         |    4 ++++
> telepathy-glib/svc-channel-request.h            |    4 ++++
> telepathy-glib/svc-channel.h                    |    4 ++++
> telepathy-glib/svc-client.h                     |    4 ++++
> telepathy-glib/svc-connection-manager.h         |    4 ++++
> telepathy-glib/svc-connection.h                 |    4 ++++
> telepathy-glib/svc-debug.h                      |    4 ++++
> telepathy-glib/svc-generic.h                    |    4 ++++
> telepathy-glib/svc-media-interfaces.h           |    4 ++++
> telepathy-glib/svc-properties-interface.h       |    4 ++++
> telepathy-glib/svc-protocol.h                   |    4 ++++
> telepathy-glib/svc-tls.h                        |    4 ++++
> telepathy-glib/text-channel.h                   |    4 ++++
> telepathy-glib/tls-certificate.h                |    4 ++++
> telepathy-glib/util.h                           |    4 ++++
> 108 files changed, 431 insertions(+)
>
>diff --git a/telepathy-glib/account-channel-request.h b/telepathy-glib/account-channel-request.h
>index fd136ae..efe0bb4 100644
>--- a/telepathy-glib/account-channel-request.h
>+++ b/telepathy-glib/account-channel-request.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_ACCOUNT_CHANNEL_REQUEST_H__
> #define __TP_ACCOUNT_CHANNEL_REQUEST_H__
> 
>diff --git a/telepathy-glib/account-manager.h b/telepathy-glib/account-manager.h
>index d569297..7c373ed 100644
>--- a/telepathy-glib/account-manager.h
>+++ b/telepathy-glib/account-manager.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef TP_ACCOUNT_MANAGER_H
> #define TP_ACCOUNT_MANAGER_H
> 
>diff --git a/telepathy-glib/account-request.h b/telepathy-glib/account-request.h
>index dcada4a..9ec4412 100644
>--- a/telepathy-glib/account-request.h
>+++ b/telepathy-glib/account-request.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef TP_ACCOUNT_REQUEST_H
> #define TP_ACCOUNT_REQUEST_H
> 
>diff --git a/telepathy-glib/account.h b/telepathy-glib/account.h
>index d1f5684..e39542d 100644
>--- a/telepathy-glib/account.h
>+++ b/telepathy-glib/account.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef TP_ACCOUNT_H
> #define TP_ACCOUNT_H
> 
>diff --git a/telepathy-glib/add-dispatch-operation-context.h b/telepathy-glib/add-dispatch-operation-context.h
>index eed353a..25d0e17 100644
>--- a/telepathy-glib/add-dispatch-operation-context.h
>+++ b/telepathy-glib/add-dispatch-operation-context.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_ADD_DISPATCH_OPERATION_CONTEXT_H__
> #define __TP_ADD_DISPATCH_OPERATION_CONTEXT_H__
> 
>diff --git a/telepathy-glib/automatic-client-factory.h b/telepathy-glib/automatic-client-factory.h
>index 0270772..d1b8e18 100644
>--- a/telepathy-glib/automatic-client-factory.h
>+++ b/telepathy-glib/automatic-client-factory.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_AUTOMATIC_CLIENT_FACTORY_H__
> #define __TP_AUTOMATIC_CLIENT_FACTORY_H__
> 
>diff --git a/telepathy-glib/automatic-proxy-factory.h b/telepathy-glib/automatic-proxy-factory.h
>index 9a135f4..11f0f0c 100644
>--- a/telepathy-glib/automatic-proxy-factory.h
>+++ b/telepathy-glib/automatic-proxy-factory.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_AUTOMATIC_PROXY_FACTORY_H__
> #define __TP_AUTOMATIC_PROXY_FACTORY_H__
> 
>diff --git a/telepathy-glib/base-call-channel.h b/telepathy-glib/base-call-channel.h
>index d905a7b..8130ccb 100644
>--- a/telepathy-glib/base-call-channel.h
>+++ b/telepathy-glib/base-call-channel.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_BASE_CALL_CHANNEL_H__
> #define __TP_BASE_CALL_CHANNEL_H__
> 
>diff --git a/telepathy-glib/base-call-content.h b/telepathy-glib/base-call-content.h
>index 1af8df5..6ce3a62 100644
>--- a/telepathy-glib/base-call-content.h
>+++ b/telepathy-glib/base-call-content.h
>@@ -20,6 +20,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef TP_BASE_CALL_CONTENT_H
> #define TP_BASE_CALL_CONTENT_H
> 
>diff --git a/telepathy-glib/base-call-stream.h b/telepathy-glib/base-call-stream.h
>index 90ae597..ebeab63 100644
>--- a/telepathy-glib/base-call-stream.h
>+++ b/telepathy-glib/base-call-stream.h
>@@ -20,6 +20,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef TP_BASE_CALL_STREAM_H
> #define TP_BASE_CALL_STREAM_H
> 
>diff --git a/telepathy-glib/base-channel.h b/telepathy-glib/base-channel.h
>index 1a45bda..2bb96aa 100644
>--- a/telepathy-glib/base-channel.h
>+++ b/telepathy-glib/base-channel.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_BASE_CHANNEL_H__
> #define __TP_BASE_CHANNEL_H__
> 
>diff --git a/telepathy-glib/base-client.h b/telepathy-glib/base-client.h
>index 9550b42..07c1302 100644
>--- a/telepathy-glib/base-client.h
>+++ b/telepathy-glib/base-client.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_BASE_CLIENT_H__
> #define __TP_BASE_CLIENT_H__
> 
>diff --git a/telepathy-glib/base-connection-manager.h b/telepathy-glib/base-connection-manager.h
>index 6fd8f30..8546e63 100644
>--- a/telepathy-glib/base-connection-manager.h
>+++ b/telepathy-glib/base-connection-manager.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_BASE_CONNECTION_MANAGER_H__
> #define __TP_BASE_CONNECTION_MANAGER_H__
> 
>diff --git a/telepathy-glib/base-connection.h b/telepathy-glib/base-connection.h
>index 8ca5877..dc53e15 100644
>--- a/telepathy-glib/base-connection.h
>+++ b/telepathy-glib/base-connection.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_BASE_CONNECTION_H__
> #define __TP_BASE_CONNECTION_H__
> 
>diff --git a/telepathy-glib/base-contact-list.h b/telepathy-glib/base-contact-list.h
>index 345b16f..3eb5b41 100644
>--- a/telepathy-glib/base-contact-list.h
>+++ b/telepathy-glib/base-contact-list.h
>@@ -17,6 +17,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_BASE_CONTACT_LIST_H__
> #define __TP_BASE_CONTACT_LIST_H__
> 
>diff --git a/telepathy-glib/base-media-call-channel.h b/telepathy-glib/base-media-call-channel.h
>index 9cc5bc8..72643c0 100644
>--- a/telepathy-glib/base-media-call-channel.h
>+++ b/telepathy-glib/base-media-call-channel.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_BASE_MEDIA_CALL_CHANNEL_H__
> #define __TP_BASE_MEDIA_CALL_CHANNEL_H__
> 
>diff --git a/telepathy-glib/base-media-call-content.h b/telepathy-glib/base-media-call-content.h
>index 4ad6555..d209dc8 100644
>--- a/telepathy-glib/base-media-call-content.h
>+++ b/telepathy-glib/base-media-call-content.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_BASE_MEDIA_CALL_CONTENT_H__
> #define __TP_BASE_MEDIA_CALL_CONTENT_H__
> 
>diff --git a/telepathy-glib/base-media-call-stream.h b/telepathy-glib/base-media-call-stream.h
>index adecc90..b8ee262 100644
>--- a/telepathy-glib/base-media-call-stream.h
>+++ b/telepathy-glib/base-media-call-stream.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_BASE_MEDIA_CALL_STREAM_H__
> #define __TP_BASE_MEDIA_CALL_STREAM_H__
> 
>diff --git a/telepathy-glib/base-password-channel.h b/telepathy-glib/base-password-channel.h
>index 3f99acd..1cabae3 100644
>--- a/telepathy-glib/base-password-channel.h
>+++ b/telepathy-glib/base-password-channel.h
>@@ -17,6 +17,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_BASE_PASSWORD_CHANNEL_H__
> #define __TP_BASE_PASSWORD_CHANNEL_H__
> 
>diff --git a/telepathy-glib/base-protocol.h b/telepathy-glib/base-protocol.h
>index 23104ca..6fd863c 100644
>--- a/telepathy-glib/base-protocol.h
>+++ b/telepathy-glib/base-protocol.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef TP_BASE_PROTOCOL_H
> #define TP_BASE_PROTOCOL_H
> 
>diff --git a/telepathy-glib/base-room-config.h b/telepathy-glib/base-room-config.h
>index 86104f9..b6f0cc3 100644
>--- a/telepathy-glib/base-room-config.h
>+++ b/telepathy-glib/base-room-config.h
>@@ -17,6 +17,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef TP_BASE_ROOM_CONFIG_H
> #define TP_BASE_ROOM_CONFIG_H
> 
>diff --git a/telepathy-glib/basic-proxy-factory.h b/telepathy-glib/basic-proxy-factory.h
>index c521d3e..bce2d6a 100644
>--- a/telepathy-glib/basic-proxy-factory.h
>+++ b/telepathy-glib/basic-proxy-factory.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_BASIC_PROXY_FACTORY_H__
> #define __TP_BASIC_PROXY_FACTORY_H__
> 
>diff --git a/telepathy-glib/call-channel.h b/telepathy-glib/call-channel.h
>index d351ffb..d6cf07e 100644
>--- a/telepathy-glib/call-channel.h
>+++ b/telepathy-glib/call-channel.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CALL_CHANNEL_H__
> #define __TP_CALL_CHANNEL_H__
> 
>diff --git a/telepathy-glib/call-content-media-description.h b/telepathy-glib/call-content-media-description.h
>index 2f5c499..8e85dbf 100644
>--- a/telepathy-glib/call-content-media-description.h
>+++ b/telepathy-glib/call-content-media-description.h
>@@ -20,6 +20,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CALL_CONTENT_MEDIA_DESCRIPTION_H__
> #define __TP_CALL_CONTENT_MEDIA_DESCRIPTION_H__
> 
>diff --git a/telepathy-glib/call-content.h b/telepathy-glib/call-content.h
>index 635edb0..f31e5c7 100644
>--- a/telepathy-glib/call-content.h
>+++ b/telepathy-glib/call-content.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CALL_CONTENT_H__
> #define __TP_CALL_CONTENT_H__
> 
>diff --git a/telepathy-glib/call-misc.h b/telepathy-glib/call-misc.h
>index b420a0a..c0367c5 100644
>--- a/telepathy-glib/call-misc.h
>+++ b/telepathy-glib/call-misc.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CALL_MISC_H__
> #define __TP_CALL_MISC_H__
> 
>diff --git a/telepathy-glib/call-stream-endpoint.h b/telepathy-glib/call-stream-endpoint.h
>index d97592c..431bd8a 100644
>--- a/telepathy-glib/call-stream-endpoint.h
>+++ b/telepathy-glib/call-stream-endpoint.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CALL_STREAM_ENDPOINT_H__
> #define __TP_CALL_STREAM_ENDPOINT_H__
> 
>diff --git a/telepathy-glib/call-stream.h b/telepathy-glib/call-stream.h
>index 50f0c36..855b03d 100644
>--- a/telepathy-glib/call-stream.h
>+++ b/telepathy-glib/call-stream.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CALL_STREAM_H__
> #define __TP_CALL_STREAM_H__
> 
>diff --git a/telepathy-glib/capabilities.h b/telepathy-glib/capabilities.h
>index b8a98a4..8d027cb 100644
>--- a/telepathy-glib/capabilities.h
>+++ b/telepathy-glib/capabilities.h
>@@ -17,6 +17,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CAPABILITIES_H__
> #define __TP_CAPABILITIES_H__
> 
>diff --git a/telepathy-glib/channel-dispatch-operation.h b/telepathy-glib/channel-dispatch-operation.h
>index fb1262f..074e4dc 100644
>--- a/telepathy-glib/channel-dispatch-operation.h
>+++ b/telepathy-glib/channel-dispatch-operation.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef TP_CHANNEL_DISPATCH_OPERATION_H
> #define TP_CHANNEL_DISPATCH_OPERATION_H
> 
>diff --git a/telepathy-glib/channel-dispatcher.h b/telepathy-glib/channel-dispatcher.h
>index 91e6b72..3394377 100644
>--- a/telepathy-glib/channel-dispatcher.h
>+++ b/telepathy-glib/channel-dispatcher.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef TP_CHANNEL_DISPATCHER_H
> #define TP_CHANNEL_DISPATCHER_H
> 
>diff --git a/telepathy-glib/channel-iface.h b/telepathy-glib/channel-iface.h
>index 3943b9c..47bdcb7 100644
>--- a/telepathy-glib/channel-iface.h
>+++ b/telepathy-glib/channel-iface.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CHANNEL_IFACE_H__
> #define __TP_CHANNEL_IFACE_H__
> 
>diff --git a/telepathy-glib/channel-manager.h b/telepathy-glib/channel-manager.h
>index 7b2f64d..6fccce3 100644
>--- a/telepathy-glib/channel-manager.h
>+++ b/telepathy-glib/channel-manager.h
>@@ -20,6 +20,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef TP_CHANNEL_MANAGER_H
> #define TP_CHANNEL_MANAGER_H
> 
>diff --git a/telepathy-glib/channel-request.h b/telepathy-glib/channel-request.h
>index 9cdf379..a298949 100644
>--- a/telepathy-glib/channel-request.h
>+++ b/telepathy-glib/channel-request.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef TP_CHANNEL_REQUEST_H
> #define TP_CHANNEL_REQUEST_H
> 
>diff --git a/telepathy-glib/channel.h b/telepathy-glib/channel.h
>index 87ea773..837fae8 100644
>--- a/telepathy-glib/channel.h
>+++ b/telepathy-glib/channel.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CHANNEL_H__
> #define __TP_CHANNEL_H__
> 
>diff --git a/telepathy-glib/client-channel-factory.h b/telepathy-glib/client-channel-factory.h
>index 12e8b1e..ebb86b2 100644
>--- a/telepathy-glib/client-channel-factory.h
>+++ b/telepathy-glib/client-channel-factory.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CLIENT_CHANNEL_FACTORY_H__
> #define __TP_CLIENT_CHANNEL_FACTORY_H__
> 
>diff --git a/telepathy-glib/client-message.h b/telepathy-glib/client-message.h
>index b8f8a21..e3ddfc9 100644
>--- a/telepathy-glib/client-message.h
>+++ b/telepathy-glib/client-message.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CLIENT_MESSAGE_H__
> #define __TP_CLIENT_MESSAGE_H__
> 
>diff --git a/telepathy-glib/client.h b/telepathy-glib/client.h
>index fce1220..003f4e2 100644
>--- a/telepathy-glib/client.h
>+++ b/telepathy-glib/client.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef TP_CLIENT_H
> #define TP_CLIENT_H
> 
>diff --git a/telepathy-glib/cm-message.h b/telepathy-glib/cm-message.h
>index 79b63de..a0516c1 100644
>--- a/telepathy-glib/cm-message.h
>+++ b/telepathy-glib/cm-message.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CM_MESSAGE_H__
> #define __TP_CM_MESSAGE_H__
> 
>diff --git a/telepathy-glib/connection-contact-list.h b/telepathy-glib/connection-contact-list.h
>index ab4d8bb..8a9f99d 100644
>--- a/telepathy-glib/connection-contact-list.h
>+++ b/telepathy-glib/connection-contact-list.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CONNECTION_CONTACT_LIST_H__
> #define __TP_CONNECTION_CONTACT_LIST_H__
> 
>diff --git a/telepathy-glib/connection-manager.h b/telepathy-glib/connection-manager.h
>index 7590031..f7f6933 100644
>--- a/telepathy-glib/connection-manager.h
>+++ b/telepathy-glib/connection-manager.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CONNECTION_MANAGER_H__
> #define __TP_CONNECTION_MANAGER_H__
> 
>diff --git a/telepathy-glib/connection.h b/telepathy-glib/connection.h
>index 55a0061..0a6a9a9 100644
>--- a/telepathy-glib/connection.h
>+++ b/telepathy-glib/connection.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CONNECTION_H__
> #define __TP_CONNECTION_H__
> 
>diff --git a/telepathy-glib/contact-operations.h b/telepathy-glib/contact-operations.h
>index 65360f5..55a377f 100644
>--- a/telepathy-glib/contact-operations.h
>+++ b/telepathy-glib/contact-operations.h
>@@ -17,6 +17,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CONTACT_OPERATIONS_H__
> #define __TP_CONTACT_OPERATIONS_H__
> 
>diff --git a/telepathy-glib/contact-search-result.h b/telepathy-glib/contact-search-result.h
>index 035afa3..4e94602 100644
>--- a/telepathy-glib/contact-search-result.h
>+++ b/telepathy-glib/contact-search-result.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CONTACT_SEARCH_RESULT_H__
> #define __TP_CONTACT_SEARCH_RESULT_H__
> 
>diff --git a/telepathy-glib/contact-search.h b/telepathy-glib/contact-search.h
>index 24636ca..4a9b0a9 100644
>--- a/telepathy-glib/contact-search.h
>+++ b/telepathy-glib/contact-search.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CONTACT_SEARCH_H__
> #define __TP_CONTACT_SEARCH_H__
> 
>diff --git a/telepathy-glib/contact.h b/telepathy-glib/contact.h
>index c91b3a3..56355d9 100644
>--- a/telepathy-glib/contact.h
>+++ b/telepathy-glib/contact.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CONTACT_H__
> #define __TP_CONTACT_H__
> 
>diff --git a/telepathy-glib/contacts-mixin.h b/telepathy-glib/contacts-mixin.h
>index ff72a11..67cec1b 100644
>--- a/telepathy-glib/contacts-mixin.h
>+++ b/telepathy-glib/contacts-mixin.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_CONTACTS_MIXIN_H__
> #define __TP_CONTACTS_MIXIN_H__
> 
>diff --git a/telepathy-glib/dbus-properties-mixin.h b/telepathy-glib/dbus-properties-mixin.h
>index 0f8bf1c..dff7271 100644
>--- a/telepathy-glib/dbus-properties-mixin.h
>+++ b/telepathy-glib/dbus-properties-mixin.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_DBUS_PROPERTIES_MIXIN_H__
> #define __TP_DBUS_PROPERTIES_MIXIN_H__
> 
>diff --git a/telepathy-glib/dbus-tube-channel.h b/telepathy-glib/dbus-tube-channel.h
>index e4ab73b..7d08eae 100644
>--- a/telepathy-glib/dbus-tube-channel.h
>+++ b/telepathy-glib/dbus-tube-channel.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_DBUS_TUBE_CHANNEL_H__
> #define __TP_DBUS_TUBE_CHANNEL_H__
> 
>diff --git a/telepathy-glib/dbus.h b/telepathy-glib/dbus.h
>index 53a2606..f4d1b76 100644
>--- a/telepathy-glib/dbus.h
>+++ b/telepathy-glib/dbus.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TELEPATHY_DBUS_H__
> #define __TELEPATHY_DBUS_H__
> #define __TP_IN_DBUS_H__
>diff --git a/telepathy-glib/debug-client.h b/telepathy-glib/debug-client.h
>index d7e69c8..74a8b2c 100644
>--- a/telepathy-glib/debug-client.h
>+++ b/telepathy-glib/debug-client.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef TP_DEBUG_CLIENT_H
> #define TP_DEBUG_CLIENT_H
> 
>diff --git a/telepathy-glib/debug-message.h b/telepathy-glib/debug-message.h
>index 3aad8fd..eba53b1 100644
>--- a/telepathy-glib/debug-message.h
>+++ b/telepathy-glib/debug-message.h
>@@ -18,6 +18,9 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
> 
> #ifndef __TP_DEBUG_MESSAGE_H__
> #define __TP_DEBUG_MESSAGE_H__
>diff --git a/telepathy-glib/debug-sender.h b/telepathy-glib/debug-sender.h
>index de7a0d1..aa8bac9 100644
>--- a/telepathy-glib/debug-sender.h
>+++ b/telepathy-glib/debug-sender.h
>@@ -17,6 +17,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_DEBUG_SENDER_H__
> #define __TP_DEBUG_SENDER_H__
> 
>diff --git a/telepathy-glib/debug.h b/telepathy-glib/debug.h
>index d04e2db..6014bf1 100644
>--- a/telepathy-glib/debug.h
>+++ b/telepathy-glib/debug.h
>@@ -1,3 +1,7 @@
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_DEBUG_H__
> #define __TP_DEBUG_H__
> 
>diff --git a/telepathy-glib/defs.h b/telepathy-glib/defs.h
>index 3d7a7d8..d7a36c6 100644
>--- a/telepathy-glib/defs.h
>+++ b/telepathy-glib/defs.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_DEFS_H__
> #define __TP_DEFS_H__
> 
>diff --git a/telepathy-glib/dtmf.h b/telepathy-glib/dtmf.h
>index c505aa0..b147e81 100644
>--- a/telepathy-glib/dtmf.h
>+++ b/telepathy-glib/dtmf.h
>@@ -17,6 +17,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_DTMF_H__
> #define __TP_DTMF_H__
> 
>diff --git a/telepathy-glib/enums.h b/telepathy-glib/enums.h
>index c4c0e2b..735177e 100644
>--- a/telepathy-glib/enums.h
>+++ b/telepathy-glib/enums.h
>@@ -1,6 +1,10 @@
> #ifndef __TP_ENUMS_H__
> #define __TP_ENUMS_H__
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #include <telepathy-glib/_gen/telepathy-enums.h>
> #include <telepathy-glib/_gen/genums.h>
> 
>diff --git a/telepathy-glib/errors.h b/telepathy-glib/errors.h
>index c0cc141..80ce3b5 100644
>--- a/telepathy-glib/errors.h
>+++ b/telepathy-glib/errors.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_ERRORS_H__
> #define __TP_ERRORS_H__
> 
>diff --git a/telepathy-glib/exportable-channel.h b/telepathy-glib/exportable-channel.h
>index 2e83a7d..6bc0384 100644
>--- a/telepathy-glib/exportable-channel.h
>+++ b/telepathy-glib/exportable-channel.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef TP_EXPORTABLE_CHANNEL_H
> #define TP_EXPORTABLE_CHANNEL_H
> 
>diff --git a/telepathy-glib/file-transfer-channel.h b/telepathy-glib/file-transfer-channel.h
>index 83c4550..cbd645e 100644
>--- a/telepathy-glib/file-transfer-channel.h
>+++ b/telepathy-glib/file-transfer-channel.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_FILE_TRANSFER_CHANNEL_H__
> #define __TP_FILE_TRANSFER_CHANNEL_H__
> 
>diff --git a/telepathy-glib/gnio-util.h b/telepathy-glib/gnio-util.h
>index 1ce7e15..d82c17d 100644
>--- a/telepathy-glib/gnio-util.h
>+++ b/telepathy-glib/gnio-util.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #include <glib-object.h>
> #include <gio/gio.h>
> 
>diff --git a/telepathy-glib/group-mixin.h b/telepathy-glib/group-mixin.h
>index caf8ce3..4020e2c 100644
>--- a/telepathy-glib/group-mixin.h
>+++ b/telepathy-glib/group-mixin.h
>@@ -20,6 +20,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_GROUP_MIXIN_H__
> #define __TP_GROUP_MIXIN_H__
> 
>diff --git a/telepathy-glib/gtypes.h b/telepathy-glib/gtypes.h
>index 3f481a8..e7d53c7 100644
>--- a/telepathy-glib/gtypes.h
>+++ b/telepathy-glib/gtypes.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_GTYPES_H__
> #define __TP_GTYPES_H__
> 
>diff --git a/telepathy-glib/handle-channels-context.h b/telepathy-glib/handle-channels-context.h
>index 95ad682..aaa28d6 100644
>--- a/telepathy-glib/handle-channels-context.h
>+++ b/telepathy-glib/handle-channels-context.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_HANDLE_CHANNELS_CONTEXT_H__
> #define __TP_HANDLE_CHANNELS_CONTEXT_H__
> 
>diff --git a/telepathy-glib/handle-repo-dynamic.h b/telepathy-glib/handle-repo-dynamic.h
>index bfd4341..be4f33f 100644
>--- a/telepathy-glib/handle-repo-dynamic.h
>+++ b/telepathy-glib/handle-repo-dynamic.h
>@@ -20,6 +20,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_HANDLE_REPO_DYNAMIC_H__
> #define __TP_HANDLE_REPO_DYNAMIC_H__
> 
>diff --git a/telepathy-glib/handle-repo-static.h b/telepathy-glib/handle-repo-static.h
>index 47f5f72..6ea2b91 100644
>--- a/telepathy-glib/handle-repo-static.h
>+++ b/telepathy-glib/handle-repo-static.h
>@@ -21,6 +21,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_HANDLE_REPO_STATIC_H__
> #define __TP_HANDLE_REPO_STATIC_H__
> 
>diff --git a/telepathy-glib/handle-repo.h b/telepathy-glib/handle-repo.h
>index cfe58e4..ece3faf 100644
>--- a/telepathy-glib/handle-repo.h
>+++ b/telepathy-glib/handle-repo.h
>@@ -21,6 +21,10 @@
>  *
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_HANDLE_REPO_H__
> #define __TP_HANDLE_REPO_H__
> 
>diff --git a/telepathy-glib/handle.h b/telepathy-glib/handle.h
>index 25a46ec..70c9450 100644
>--- a/telepathy-glib/handle.h
>+++ b/telepathy-glib/handle.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_HANDLE_H__
> #define __TP_HANDLE_H__
> 
>diff --git a/telepathy-glib/heap.h b/telepathy-glib/heap.h
>index cca243c..426777f 100644
>--- a/telepathy-glib/heap.h
>+++ b/telepathy-glib/heap.h
>@@ -20,6 +20,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_HEAP_H__
> #define __TP_HEAP_H__
> 
>diff --git a/telepathy-glib/interfaces.h b/telepathy-glib/interfaces.h
>index 202d389..ee98120 100644
>--- a/telepathy-glib/interfaces.h
>+++ b/telepathy-glib/interfaces.h
>@@ -1,3 +1,7 @@
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_INTERFACES_H__
> #define __TP_INTERFACES_H__
> 
>diff --git a/telepathy-glib/intset.h b/telepathy-glib/intset.h
>index e1ac2e8..c56715b 100644
>--- a/telepathy-glib/intset.h
>+++ b/telepathy-glib/intset.h
>@@ -20,6 +20,10 @@
>  *
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_INTSET_H__
> #define __TP_INTSET_H__
> 
>diff --git a/telepathy-glib/media-interfaces.h b/telepathy-glib/media-interfaces.h
>index 6dc6015..71bcd0e 100644
>--- a/telepathy-glib/media-interfaces.h
>+++ b/telepathy-glib/media-interfaces.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_MEDIA_INTERFACES_H__
> #define __TP_MEDIA_INTERFACES_H__
> 
>diff --git a/telepathy-glib/message-mixin.h b/telepathy-glib/message-mixin.h
>index 2293733..5dde099 100644
>--- a/telepathy-glib/message-mixin.h
>+++ b/telepathy-glib/message-mixin.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef TP_MESSAGE_MIXIN_H
> #define TP_MESSAGE_MIXIN_H
> 
>diff --git a/telepathy-glib/message.h b/telepathy-glib/message.h
>index 1e35384..5f2ddf8 100644
>--- a/telepathy-glib/message.h
>+++ b/telepathy-glib/message.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_MESSAGE_H__
> #define __TP_MESSAGE_H__
> 
>diff --git a/telepathy-glib/observe-channels-context.h b/telepathy-glib/observe-channels-context.h
>index 3666289..1c8ea47 100644
>--- a/telepathy-glib/observe-channels-context.h
>+++ b/telepathy-glib/observe-channels-context.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_OBSERVE_CHANNELS_CONTEXT_H__
> #define __TP_OBSERVE_CHANNELS_CONTEXT_H__
> 
>diff --git a/telepathy-glib/presence-mixin.h b/telepathy-glib/presence-mixin.h
>index 48cef75..63d2c7e 100644
>--- a/telepathy-glib/presence-mixin.h
>+++ b/telepathy-glib/presence-mixin.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_PRESENCE_MIXIN_H__
> #define __TP_PRESENCE_MIXIN_H__
> 
>diff --git a/telepathy-glib/protocol.h b/telepathy-glib/protocol.h
>index da729a6..af64c3a 100644
>--- a/telepathy-glib/protocol.h
>+++ b/telepathy-glib/protocol.h
>@@ -17,6 +17,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef TP_PROTOCOL_H
> #define TP_PROTOCOL_H
> 
>diff --git a/telepathy-glib/proxy.h b/telepathy-glib/proxy.h
>index 300b507..04f4141 100644
>--- a/telepathy-glib/proxy.h
>+++ b/telepathy-glib/proxy.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_PROXY_H__
> #define __TP_PROXY_H__
> 
>diff --git a/telepathy-glib/room-info.h b/telepathy-glib/room-info.h
>index d114c32..0b33bc1 100644
>--- a/telepathy-glib/room-info.h
>+++ b/telepathy-glib/room-info.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_ROOM_INFO_H__
> #define __TP_ROOM_INFO_H__
> 
>diff --git a/telepathy-glib/room-list.h b/telepathy-glib/room-list.h
>index bc1042c..221b9aa 100644
>--- a/telepathy-glib/room-list.h
>+++ b/telepathy-glib/room-list.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_ROOM_LIST_H__
> #define __TP_ROOM_LIST_H__
> 
>diff --git a/telepathy-glib/run.h b/telepathy-glib/run.h
>index 21c0ef3..463a3e6 100644
>--- a/telepathy-glib/run.h
>+++ b/telepathy-glib/run.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_RUN_H__
> #define __TP_RUN_H__
> 
>diff --git a/telepathy-glib/signalled-message.h b/telepathy-glib/signalled-message.h
>index 9b72e56..6fa8f45 100644
>--- a/telepathy-glib/signalled-message.h
>+++ b/telepathy-glib/signalled-message.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_SIGNALLED_MESSAGE_H__
> #define __TP_SIGNALLED_MESSAGE_H__
> 
>diff --git a/telepathy-glib/simple-approver.h b/telepathy-glib/simple-approver.h
>index 0925b7e..74e01ae 100644
>--- a/telepathy-glib/simple-approver.h
>+++ b/telepathy-glib/simple-approver.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_SIMPLE_APPROVER_H__
> #define __TP_SIMPLE_APPROVER_H__
> 
>diff --git a/telepathy-glib/simple-client-factory.h b/telepathy-glib/simple-client-factory.h
>index ced2504..03e94a1 100644
>--- a/telepathy-glib/simple-client-factory.h
>+++ b/telepathy-glib/simple-client-factory.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_SIMPLE_CLIENT_FACTORY_H__
> #define __TP_SIMPLE_CLIENT_FACTORY_H__
> 
>diff --git a/telepathy-glib/simple-handler.h b/telepathy-glib/simple-handler.h
>index 48e5d76..6d4a21f 100644
>--- a/telepathy-glib/simple-handler.h
>+++ b/telepathy-glib/simple-handler.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_SIMPLE_HANDLER_H__
> #define __TP_SIMPLE_HANDLER_H__
> 
>diff --git a/telepathy-glib/simple-observer.h b/telepathy-glib/simple-observer.h
>index 107ef36..512f928 100644
>--- a/telepathy-glib/simple-observer.h
>+++ b/telepathy-glib/simple-observer.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_SIMPLE_OBSERVER_H__
> #define __TP_SIMPLE_OBSERVER_H__
> 
>diff --git a/telepathy-glib/simple-password-manager.h b/telepathy-glib/simple-password-manager.h
>index 854cb80..6842201 100644
>--- a/telepathy-glib/simple-password-manager.h
>+++ b/telepathy-glib/simple-password-manager.h
>@@ -17,6 +17,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_SIMPLE_PASSWORD_MANAGER_H__
> #define __TP_SIMPLE_PASSWORD_MANAGER_H__
> 
>diff --git a/telepathy-glib/stream-tube-channel.h b/telepathy-glib/stream-tube-channel.h
>index 39c2c7e..26709a5 100644
>--- a/telepathy-glib/stream-tube-channel.h
>+++ b/telepathy-glib/stream-tube-channel.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_STREAM_TUBE_CHANNEL_H__
> #define __TP_STREAM_TUBE_CHANNEL_H__
> 
>diff --git a/telepathy-glib/stream-tube-connection.h b/telepathy-glib/stream-tube-connection.h
>index 771affe..9cba476 100644
>--- a/telepathy-glib/stream-tube-connection.h
>+++ b/telepathy-glib/stream-tube-connection.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_STREAM_TUBE_CONNECTION_H__
> #define __TP_STREAM_TUBE_CONNECTION_H__
> 
>diff --git a/telepathy-glib/svc-account-manager.h b/telepathy-glib/svc-account-manager.h
>index ed7b4e2..a2daf34 100644
>--- a/telepathy-glib/svc-account-manager.h
>+++ b/telepathy-glib/svc-account-manager.h
>@@ -1,3 +1,7 @@
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_META_SVC_ACCOUNT_MANAGER_H__
> #define __TP_META_SVC_ACCOUNT_MANAGER_H__
> 
>diff --git a/telepathy-glib/svc-account.h b/telepathy-glib/svc-account.h
>index 1818cb3..187323d 100644
>--- a/telepathy-glib/svc-account.h
>+++ b/telepathy-glib/svc-account.h
>@@ -1,3 +1,7 @@
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_META_SVC_ACCOUNT_H__
> #define __TP_META_SVC_ACCOUNT_H__
> 
>diff --git a/telepathy-glib/svc-call.h b/telepathy-glib/svc-call.h
>index 76cd6c7..b785841 100644
>--- a/telepathy-glib/svc-call.h
>+++ b/telepathy-glib/svc-call.h
>@@ -1,3 +1,7 @@
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_META_SVC_ACCOUNT_H__
> #define __TP_META_SVC_ACCOUNT_H__
> 
>diff --git a/telepathy-glib/svc-channel-dispatch-operation.h b/telepathy-glib/svc-channel-dispatch-operation.h
>index ae74c54..2bbe054 100644
>--- a/telepathy-glib/svc-channel-dispatch-operation.h
>+++ b/telepathy-glib/svc-channel-dispatch-operation.h
>@@ -1,3 +1,7 @@
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_META_SVC_CHANNEL_DISPATCH_OPERATION_H__
> #define __TP_META_SVC_CHANNEL_DISPATCH_OPERATION_H__
> 
>diff --git a/telepathy-glib/svc-channel-dispatcher.h b/telepathy-glib/svc-channel-dispatcher.h
>index 87ad459..f8e2cbd 100644
>--- a/telepathy-glib/svc-channel-dispatcher.h
>+++ b/telepathy-glib/svc-channel-dispatcher.h
>@@ -1,3 +1,7 @@
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_META_SVC_CHANNEL_DISPATCHER_H__
> #define __TP_META_SVC_CHANNEL_DISPATCHER_H__
> 
>diff --git a/telepathy-glib/svc-channel-request.h b/telepathy-glib/svc-channel-request.h
>index f849a82..781d6e0 100644
>--- a/telepathy-glib/svc-channel-request.h
>+++ b/telepathy-glib/svc-channel-request.h
>@@ -1,3 +1,7 @@
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_META_SVC_CHANNEL_REQUEST_H__
> #define __TP_META_SVC_CHANNEL_REQUEST_H__
> 
>diff --git a/telepathy-glib/svc-channel.h b/telepathy-glib/svc-channel.h
>index 479ab7e..452a933 100644
>--- a/telepathy-glib/svc-channel.h
>+++ b/telepathy-glib/svc-channel.h
>@@ -1,3 +1,7 @@
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_META_SVC_CHANNEL_H__
> #define __TP_META_SVC_CHANNEL_H__
> 
>diff --git a/telepathy-glib/svc-client.h b/telepathy-glib/svc-client.h
>index d774a9d..c7aab8a 100644
>--- a/telepathy-glib/svc-client.h
>+++ b/telepathy-glib/svc-client.h
>@@ -1,3 +1,7 @@
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_META_SVC_CLIENT_H__
> #define __TP_META_SVC_CLIENT_H__
> 
>diff --git a/telepathy-glib/svc-connection-manager.h b/telepathy-glib/svc-connection-manager.h
>index b0cd98d..cb5e04c 100644
>--- a/telepathy-glib/svc-connection-manager.h
>+++ b/telepathy-glib/svc-connection-manager.h
>@@ -1,3 +1,7 @@
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_META_SVC_CONNECTION_MANAGER_H__
> #define __TP_META_SVC_CONNECTION_MANAGER_H__
> 
>diff --git a/telepathy-glib/svc-connection.h b/telepathy-glib/svc-connection.h
>index 6cfa7dd..60e8437 100644
>--- a/telepathy-glib/svc-connection.h
>+++ b/telepathy-glib/svc-connection.h
>@@ -1,3 +1,7 @@
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_META_SVC_CONNECTION_H__
> #define __TP_META_SVC_CONNECTION_H__
> 
>diff --git a/telepathy-glib/svc-debug.h b/telepathy-glib/svc-debug.h
>index abedc37..682e631 100644
>--- a/telepathy-glib/svc-debug.h
>+++ b/telepathy-glib/svc-debug.h
>@@ -1,3 +1,7 @@
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_SVC_DEBUG_H__
> #define __TP_SVC_DEBUG_H__
> 
>diff --git a/telepathy-glib/svc-generic.h b/telepathy-glib/svc-generic.h
>index 326cd7d..bcb4775 100644
>--- a/telepathy-glib/svc-generic.h
>+++ b/telepathy-glib/svc-generic.h
>@@ -1,3 +1,7 @@
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_SVC_GENERIC_H__
> #define __TP_SVC_GENERIC_H__
> 
>diff --git a/telepathy-glib/svc-media-interfaces.h b/telepathy-glib/svc-media-interfaces.h
>index c1c27ad..004f942 100644
>--- a/telepathy-glib/svc-media-interfaces.h
>+++ b/telepathy-glib/svc-media-interfaces.h
>@@ -1,3 +1,7 @@
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_SVC_MEDIA_INTERFACES_H__
> #define __TP_SVC_MEDIA_INTERFACES_H__
> 
>diff --git a/telepathy-glib/svc-properties-interface.h b/telepathy-glib/svc-properties-interface.h
>index 1f9a066..2cae3d0 100644
>--- a/telepathy-glib/svc-properties-interface.h
>+++ b/telepathy-glib/svc-properties-interface.h
>@@ -1,2 +1,6 @@
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> /* svc-properties-interface is now officially svc-generic */
> #include <telepathy-glib/svc-generic.h>
>diff --git a/telepathy-glib/svc-protocol.h b/telepathy-glib/svc-protocol.h
>index 934d44f..8e0b3d6 100644
>--- a/telepathy-glib/svc-protocol.h
>+++ b/telepathy-glib/svc-protocol.h
>@@ -1,3 +1,7 @@
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_META_SVC_PROTOCOL_H__
> #define __TP_META_SVC_PROTOCOL_H__
> 
>diff --git a/telepathy-glib/svc-tls.h b/telepathy-glib/svc-tls.h
>index 9c4fc56..8b03e50 100644
>--- a/telepathy-glib/svc-tls.h
>+++ b/telepathy-glib/svc-tls.h
>@@ -1,3 +1,7 @@
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_META_SVC_TLS_H__
> #define __TP_META_SVC_TLS_H__
> 
>diff --git a/telepathy-glib/text-channel.h b/telepathy-glib/text-channel.h
>index 828def4..c4f7829 100644
>--- a/telepathy-glib/text-channel.h
>+++ b/telepathy-glib/text-channel.h
>@@ -18,6 +18,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_TEXT_CHANNEL_H__
> #define __TP_TEXT_CHANNEL_H__
> 
>diff --git a/telepathy-glib/tls-certificate.h b/telepathy-glib/tls-certificate.h
>index 72b1c01..0b28869 100644
>--- a/telepathy-glib/tls-certificate.h
>+++ b/telepathy-glib/tls-certificate.h
>@@ -20,6 +20,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_TLS_CERTIFICATE_H__
> #define __TP_TLS_CERTIFICATE_H__
> 
>diff --git a/telepathy-glib/util.h b/telepathy-glib/util.h
>index 3474e7e..cad2507 100644
>--- a/telepathy-glib/util.h
>+++ b/telepathy-glib/util.h
>@@ -19,6 +19,10 @@
>  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  */
> 
>+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
>+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
>+#endif
>+
> #ifndef __TP_UTIL_H__
> #define __TP_UTIL_H__
> #define __TP_IN_UTIL_H__
>-- 
>1.7.9.5

Actions: View | Splinter Review

Attachments on bug 49384: 61027 | 61028 | 61030 | 61031 | 61032 | 61033 | 61034 | 61035 | 61036 | 62274 | 62275 | 62276 | 62277 | 62278 | 62279 | 62280 | 62525 | 62526 | 62527 | 62528 | 62529 | 62530 | 62531

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.