diff options
| author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-06-06 11:27:10 +0200 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-06-06 11:27:10 +0200 |
| commit | 158749c77bbf45361fb2a2dc1cace85af11dc202 (patch) | |
| tree | 762bb6c18a2f5dc956b3564914f4c84b22c46480 | |
| parent | b511e3ec078117fb8fdc64a8f0a78813e2813002 (diff) | |
| parent | 3bfa39887625370541e0c654356124ec1ba24501 (diff) | |
Merge branch 'master' into next
Conflicts:
telepathy-glib/automatic-proxy-factory.h
telepathy-glib/basic-proxy-factory.h
telepathy-glib/client-channel-factory.h
telepathy-glib/introspection.am
telepathy-glib/media-interfaces.h
telepathy-glib/simple-client-factory.h
telepathy-glib/svc-media-interfaces.h
telepathy-glib/telepathy-glib.h
telepathy-glib/text-mixin.h
119 files changed, 450 insertions, 28 deletions
@@ -41,8 +41,7 @@ Deprecations: • Struct members of TpProxy, TpConnectionManagerParam, TpConnectionManager and TpBaseConnection have been sealed. In the same spirit than G_SEAL, we - introduced _TP_SEAL to force usage of getters and setters. Applications should - define TP_SEAL_ENABLE or TP_DISABLE_DEPRECATED to enable that. (Simon) + introduced _TP_SEAL to force usage of getters and setters. (Simon) Enhancements: diff --git a/examples/client/Makefile.am b/examples/client/Makefile.am index e99742d9c..4e327938a 100644 --- a/examples/client/Makefile.am +++ b/examples/client/Makefile.am @@ -59,7 +59,7 @@ LDADD = \ AM_CPPFLAGS = \ -I${top_srcdir} -I${top_builddir} \ - -DTP_SEAL_ENABLE \ + -DTP_DISABLE_SINGLE_INCLUDE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(NULL) diff --git a/examples/client/dbus-tubes/Makefile.am b/examples/client/dbus-tubes/Makefile.am index 6bb258fe5..0cf7d4473 100644 --- a/examples/client/dbus-tubes/Makefile.am +++ b/examples/client/dbus-tubes/Makefile.am @@ -16,7 +16,7 @@ LDADD = \ @GLIB_LIBS@ AM_CPPFLAGS = \ - -DTP_SEAL_ENABLE \ + -DTP_DISABLE_SINGLE_INCLUDE \ $(NULL) AM_CFLAGS = \ diff --git a/examples/client/stream-tubes/Makefile.am b/examples/client/stream-tubes/Makefile.am index 97e7f5a3f..f0d772279 100644 --- a/examples/client/stream-tubes/Makefile.am +++ b/examples/client/stream-tubes/Makefile.am @@ -17,7 +17,7 @@ LDADD = \ $(NULL) AM_CPPFLAGS = \ - -DTP_SEAL_ENABLE \ + -DTP_DISABLE_SINGLE_INCLUDE \ $(NULL) AM_CFLAGS = \ diff --git a/examples/cm/call/Makefile.am b/examples/cm/call/Makefile.am index 9d762460b..c320ca992 100644 --- a/examples/cm/call/Makefile.am +++ b/examples/cm/call/Makefile.am @@ -65,7 +65,7 @@ LDADD = \ # AM_CPPFLAGS. AM_CPPFLAGS = \ -I${top_srcdir} -I${top_builddir} \ - -DTP_SEAL_ENABLE \ + -DTP_DISABLE_SINGLE_INCLUDE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(NULL) diff --git a/examples/cm/channelspecific/Makefile.am b/examples/cm/channelspecific/Makefile.am index dc7e7ed3f..255295215 100644 --- a/examples/cm/channelspecific/Makefile.am +++ b/examples/cm/channelspecific/Makefile.am @@ -62,7 +62,7 @@ LDADD = \ # AM_CPPFLAGS. AM_CPPFLAGS = \ -I${top_srcdir} -I${top_builddir} \ - -DTP_SEAL_ENABLE \ + -DTP_DISABLE_SINGLE_INCLUDE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(NULL) diff --git a/examples/cm/contactlist/Makefile.am b/examples/cm/contactlist/Makefile.am index 35b7e8ae2..dd6ca3306 100644 --- a/examples/cm/contactlist/Makefile.am +++ b/examples/cm/contactlist/Makefile.am @@ -58,7 +58,7 @@ LDADD = \ # AM_CPPFLAGS. AM_CPPFLAGS = \ -I${top_srcdir} -I${top_builddir} \ - -DTP_SEAL_ENABLE \ + -DTP_DISABLE_SINGLE_INCLUDE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(NULL) diff --git a/examples/cm/echo-message-parts/Makefile.am b/examples/cm/echo-message-parts/Makefile.am index 73c3c5184..8962ed820 100644 --- a/examples/cm/echo-message-parts/Makefile.am +++ b/examples/cm/echo-message-parts/Makefile.am @@ -58,7 +58,7 @@ LDADD = \ # AM_CPPFLAGS. AM_CPPFLAGS = \ -I${top_srcdir} -I${top_builddir} \ - -DTP_SEAL_ENABLE \ + -DTP_DISABLE_SINGLE_INCLUDE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(NULL) diff --git a/examples/cm/echo-message-parts/chan.c b/examples/cm/echo-message-parts/chan.c index 47325793b..da4ba6acf 100644 --- a/examples/cm/echo-message-parts/chan.c +++ b/examples/cm/echo-message-parts/chan.c @@ -18,9 +18,6 @@ #include <telepathy-glib/telepathy-glib.h> #include <telepathy-glib/telepathy-glib-dbus.h> -/* FIXME: example code should not be doing this! */ -#include <telepathy-glib/message-internal.h> - static void destroyable_iface_init (gpointer iface, gpointer data); static void sms_iface_init (gpointer iface, gpointer data); @@ -413,10 +410,15 @@ sms_get_sms_length (TpSvcChannelInterfaceSMS *self, for (i = 0; i < parts->len; i++) { - tp_g_hash_table_update (g_ptr_array_index (message->parts, i), - g_ptr_array_index (parts, i), - (GBoxedCopyFunc) g_strdup, - (GBoxedCopyFunc) tp_g_value_slice_dup); + GHashTableIter iter; + gpointer key, value; + + tp_message_append_part (message); + g_hash_table_iter_init (&iter, g_ptr_array_index (parts, i)); + while (g_hash_table_iter_next (&iter, &key, &value)) + { + tp_message_set (message, i, key, value); + } } txt = tp_message_to_text (message); diff --git a/examples/cm/extended/Makefile.am b/examples/cm/extended/Makefile.am index dc756bbbf..2e00e54b9 100644 --- a/examples/cm/extended/Makefile.am +++ b/examples/cm/extended/Makefile.am @@ -47,7 +47,7 @@ LDADD = \ # AM_CPPFLAGS. AM_CPPFLAGS = \ -I${top_srcdir} -I${top_builddir} \ - -DTP_SEAL_ENABLE \ + -DTP_DISABLE_SINGLE_INCLUDE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(NULL) diff --git a/examples/cm/no-protocols/Makefile.am b/examples/cm/no-protocols/Makefile.am index 046abb994..8deb0a054 100644 --- a/examples/cm/no-protocols/Makefile.am +++ b/examples/cm/no-protocols/Makefile.am @@ -42,7 +42,7 @@ LDADD = \ # AM_CPPFLAGS. AM_CPPFLAGS = \ -I${top_srcdir} -I${top_builddir} \ - -DTP_SEAL_ENABLE \ + -DTP_DISABLE_SINGLE_INCLUDE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(NULL) diff --git a/examples/extensions/Makefile.am b/examples/extensions/Makefile.am index 4946deb07..35c8d588e 100644 --- a/examples/extensions/Makefile.am +++ b/examples/extensions/Makefile.am @@ -10,7 +10,7 @@ tools_dir = $(top_srcdir)/tools AM_CPPFLAGS = \ - -DTP_SEAL_ENABLE \ + -DTP_DISABLE_SINGLE_INCLUDE \ $(NULL) AM_CFLAGS = \ @@ -143,7 +143,7 @@ _gen/svc-connection.c: _gen/connection.xml \ $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \ --filename=_gen/svc-connection \ --signal-marshal-prefix=_example_ext \ - --include='<telepathy-glib/dbus.h>' \ + --include='<telepathy-glib/telepathy-glib.h>' \ --not-implemented-func='tp_dbus_g_method_return_not_implemented' \ --allow-unstable \ $< Example_Svc_ diff --git a/telepathy-glib/account-channel-request.h b/telepathy-glib/account-channel-request.h index 23728c2a7..de95dff11 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 4c43de946..feb1a42af 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 dcada4a6c..9ec441255 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 b5c859f95..86edbffd2 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 eed353a94..25d0e179d 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 b942bebd7..ea8c9ae8b 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/base-call-channel.h b/telepathy-glib/base-call-channel.h index d905a7bf8..8130ccb3c 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 1af8df505..6ce3a62f4 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 90ae597ec..ebeab6359 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 c0f114bce..bf3b0f1d3 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 4d77ea5bb..582419ab1 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 66e4602e6..69666e5d5 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 e1257417c..8e3d7ae09 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__ @@ -201,12 +205,14 @@ gboolean tp_base_connection_channel_manager_iter_next ( TpBaseConnection *c_ = (conn); \ GError *e_ = NULL; \ \ + G_GNUC_BEGIN_IGNORE_DEPRECATIONS \ if (!tp_base_connection_check_connected (c_, &e_)) \ { \ dbus_g_method_return_error ((context), e_); \ g_error_free (e_); \ return; \ } \ + G_GNUC_END_IGNORE_DEPRECATIONS \ } G_STMT_END TpDBusDaemon *tp_base_connection_get_dbus_daemon (TpBaseConnection *self); diff --git a/telepathy-glib/base-contact-list.h b/telepathy-glib/base-contact-list.h index 7988602ef..c2263eac1 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 9cc5bc820..72643c0c5 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 4ad655531..d209dc855 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 adecc907f..b8ee262c0 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 3f99acd1d..1cabae313 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 a2e764bc5..e57b4d963 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 86104f93c..b6f0cc355 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/call-channel.h b/telepathy-glib/call-channel.h index d351ffbf7..d6cf07e2f 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 2f5c49964..8e85dbf93 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 df694eadc..8bd3eea98 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 56cc75938..5ea50f7c3 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 d97592caa..431bd8a45 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 38452712c..6adb07b91 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 b8a98a447..8d027cb50 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 fe8c38d37..4306027a4 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 3459ed6a1..b6ad6d38c 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 3943b9c78..47bdcb764 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 72bcb56bd..0b06daf30 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 68f04f5f6..91ec9d057 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 ffb2e37cf..db3f795f1 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-factory.h b/telepathy-glib/client-factory.h index 0b1350ad9..48295bbd4 100644 --- a/telepathy-glib/client-factory.h +++ b/telepathy-glib/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_CLIENT_FACTORY_H__ #define __TP_CLIENT_FACTORY_H__ diff --git a/telepathy-glib/client-message.h b/telepathy-glib/client-message.h index b8f8a21ac..e3ddfc971 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 55143bf8b..470100c73 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 3906e2382..e9db42483 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 ab4d8bb6a..8a9f99d65 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 bf19dbe80..ac4208671 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 9c86d6a5e..0f14c46a4 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 65360f532..55a377f42 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 035afa397..4e9460277 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 24636ca6f..4a9b0a91d 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 f06ab444e..ed4928c33 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 021cde68b..6d0f1cc55 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 0f8bf1c07..dff7271f5 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 e4ab73be2..7d08eaed9 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 06060eaf7..df09e51e6 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 2c28d75cc..0b5d930c3 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 3aad8fd1a..eba53b19a 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 ec4f72c4d..068dbbca8 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 8615dc4aa..1d6a9f2eb 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 941565b18..572ac2217 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__ @@ -159,8 +163,7 @@ G_BEGIN_DECLS #endif /* like G_SEAL */ -#if (defined (TP_SEAL_ENABLE) || defined (TP_DISABLE_DEPRECATED)) \ - && !defined (_TP_COMPILATION) +#if (TP_VERSION_MIN_REQUIRED >= TP_VERSION_0_20) && !defined (_TP_COMPILATION) # define _TP_SEAL(ident) _tp_sealed__ ## ident #else # define _TP_SEAL(ident) ident diff --git a/telepathy-glib/dtmf.h b/telepathy-glib/dtmf.h index c505aa0ce..b147e816b 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 d80997c32..f6629394b 100644 --- a/telepathy-glib/enums.h +++ b/telepathy-glib/enums.h @@ -22,6 +22,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 126c81b39..27ddb125a 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 2e83a7de9..6bc0384c5 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 83c455023..cbd645e4f 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 1ce7e1561..d82c17da5 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 d10f115e6..8285ca49a 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 3f481a8dd..e7d53c766 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 95ad682af..aaa28d6a8 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 bfd43413c..be4f33f40 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 47f5f722b..6ea2b916d 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 1641f43f8..619b8ecd8 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 25a46ec96..70c94506b 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 cca243cf4..426777f1f 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 3bb12cdcf..8c5bb6bdf 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/introspection.am b/telepathy-glib/introspection.am index dc09f2a05..fcab38cc2 100644 --- a/telepathy-glib/introspection.am +++ b/telepathy-glib/introspection.am @@ -96,6 +96,7 @@ TelepathyGLib_1_gir_LIBS = \ libtelepathy-glib-1-core.la \ $(NULL) TelepathyGLib_1_gir_EXPORT_PACKAGES = telepathy-glib-1 +TelepathyGLib_0_12_gir_CFLAGS = -D_TP_COMPILATION TelepathyGLib_1_gir_SCANNERFLAGS = \ --identifier-prefix=Tp \ diff --git a/telepathy-glib/intset.h b/telepathy-glib/intset.h index 4fcb77f12..08d02c615 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/message-mixin.h b/telepathy-glib/message-mixin.h index 4696f4feb..7c4fa07c0 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 99c0c28c5..951fd170a 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 3666289aa..1c8ea4791 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 18c6ae802..ad16c0e76 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 454a3cf05..321dff472 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-subclass.h b/telepathy-glib/proxy-subclass.h index 50ee18841..f31718b38 100644 --- a/telepathy-glib/proxy-subclass.h +++ b/telepathy-glib/proxy-subclass.h @@ -23,6 +23,8 @@ #ifndef __TP_PROXY_SUBCLASS_H__ #define __TP_PROXY_SUBCLASS_H__ +#define _TP_IN_META_HEADER + #include <telepathy-glib/proxy.h> G_BEGIN_DECLS @@ -78,4 +80,6 @@ void tp_proxy_init_known_interfaces (void); G_END_DECLS +#undef _TP_IN_META_HEADER + #endif /* #ifndef __TP_PROXY_SUBCLASS_H__*/ diff --git a/telepathy-glib/proxy.h b/telepathy-glib/proxy.h index c41ac42ba..f1bff22e8 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 d114c3240..0b33bc1f2 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 bc1042c41..221b9aa9e 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 21c0ef3c4..463a3e6f2 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 9b72e56e3..6fa8f45f5 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 a584a9b2f..111c580ff 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-handler.h b/telepathy-glib/simple-handler.h index 1f27fb2f6..f378f3736 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 276bb935e..f03b2c13f 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 854cb80dc..6842201c6 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 39c2c7e6f..26709a5d8 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 771affe6e..9cba4769e 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 ed7b4e248..a2daf3412 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 1818cb3af..187323ded 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 76cd6c7d9..b785841ab 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 ae74c5435..2bbe054ec 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 87ad45973..f8e2cbd8d 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 f849a8239..781d6e03a 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 479ab7eec..452a93358 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 d774a9d9d..c7aab8a61 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 b0cd98dce..cb5e04cb1 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 6cfa7dd77..60e8437de 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 abedc378e..682e63117 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 326cd7d2d..bcb4775f6 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-properties-interface.h b/telepathy-glib/svc-properties-interface.h index 1f9a066be..2cae3d070 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 934d44f20..8e0b3d631 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 9c4fc561a..8b03e503d 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/telepathy-glib-dbus.h b/telepathy-glib/telepathy-glib-dbus.h index ea644674c..980f3c8ff 100644 --- a/telepathy-glib/telepathy-glib-dbus.h +++ b/telepathy-glib/telepathy-glib-dbus.h @@ -18,12 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef TELEPATHY_GLIB_DBUS_H_INCLUDED -#define TELEPATHY_GLIB_DBUS_H_INCLUDED -#define _TP_IN_META_HEADER +#ifndef __TP_GLIB_DBUS_H__ +#define __TP_GLIB_DBUS_H__ #include <telepathy-glib/telepathy-glib.h> +#define _TP_IN_META_HEADER + /* common */ #include <telepathy-glib/gtypes.h> #include <telepathy-glib/interfaces.h> @@ -65,4 +66,5 @@ #include <telepathy-glib/svc-tls.h> #undef _TP_IN_META_HEADER -#endif + +#endif /* __TP_GLIB_DBUS_H__ */ diff --git a/telepathy-glib/telepathy-glib.h b/telepathy-glib/telepathy-glib.h index cb4d7279b..0e221870a 100644 --- a/telepathy-glib/telepathy-glib.h +++ b/telepathy-glib/telepathy-glib.h @@ -20,7 +20,8 @@ #ifndef __TP_GLIB_H__ #define __TP_GLIB_H__ -#define __TP_IN_GLIB_H__ + +#define _TP_IN_META_HEADER #include <telepathy-glib/enums.h> #include <telepathy-glib/errors.h> @@ -110,5 +111,6 @@ #include <telepathy-glib/text-channel.h> #include <telepathy-glib/tls-certificate.h> -#undef __TP_IN_GLIB_H__ +#undef _TP_IN_META_HEADER + #endif /* __TP_GLIB_H__ */ diff --git a/telepathy-glib/text-channel.h b/telepathy-glib/text-channel.h index 828def48d..c4f782978 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 72b1c018d..0b2886983 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 64cc018af..7a67e7c86 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__ |