diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-04 15:51:19 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-04 15:51:19 +0000 |
| commit | f75008175d3aa5397204eb3d0b757cb49fcde30c (patch) | |
| tree | d0e453fda13b6c25cde263461e312feb511e9488 /src | |
| parent | 6e71b391494a265ecfe80691d8acfd8340d3eab2 (diff) | |
| download | telepathy-salut-f75008175d3aa5397204eb3d0b757cb49fcde30c.tar.gz | |
Be single-include-compliant
Diffstat (limited to 'src')
53 files changed, 82 insertions, 142 deletions
diff --git a/src/avahi-contact.c b/src/avahi-contact.c index 67f2ba48..dd15ed4e 100644 --- a/src/avahi-contact.c +++ b/src/avahi-contact.c @@ -32,8 +32,8 @@ #include <avahi-common/defs.h> #include <avahi-common/malloc.h> -#include <telepathy-glib/channel-factory-iface.h> -#include <telepathy-glib/interfaces.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #define DEBUG_FLAG DEBUG_MUC #include "debug.h" diff --git a/src/avahi-muc-manager.c b/src/avahi-muc-manager.c index e3fe9fd1..9e9083eb 100644 --- a/src/avahi-muc-manager.c +++ b/src/avahi-muc-manager.c @@ -38,8 +38,8 @@ #include "roomlist-channel.h" #include "avahi-muc-channel.h" -#include <telepathy-glib/channel-factory-iface.h> -#include <telepathy-glib/interfaces.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #define DEBUG_FLAG DEBUG_MUC #include "debug.h" diff --git a/src/avahi-olpc-activity-manager.h b/src/avahi-olpc-activity-manager.h index 557f663b..88c94db3 100644 --- a/src/avahi-olpc-activity-manager.h +++ b/src/avahi-olpc-activity-manager.h @@ -23,7 +23,7 @@ #include <glib-object.h> -#include <telepathy-glib/handle.h> +#include <telepathy-glib/telepathy-glib.h> #include "olpc-activity-manager.h" #include "connection.h" diff --git a/src/avahi-roomlist-manager.c b/src/avahi-roomlist-manager.c index 9ddd9dbf..a888a5eb 100644 --- a/src/avahi-roomlist-manager.c +++ b/src/avahi-roomlist-manager.c @@ -36,8 +36,8 @@ #include "contact-manager.h" #include "roomlist-channel.h" -#include <telepathy-glib/channel-factory-iface.h> -#include <telepathy-glib/interfaces.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #define DEBUG_FLAG DEBUG_MUC #include "debug.h" diff --git a/src/bonjour-contact.c b/src/bonjour-contact.c index ba0ba7b0..4b931de4 100644 --- a/src/bonjour-contact.c +++ b/src/bonjour-contact.c @@ -26,8 +26,8 @@ #include <stdlib.h> #include <string.h> -#include <telepathy-glib/channel-factory-iface.h> -#include <telepathy-glib/interfaces.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #define DEBUG_FLAG DEBUG_MUC #include "debug.h" diff --git a/src/capabilities.c b/src/capabilities.c index c927cea8..68aeaba4 100644 --- a/src/capabilities.c +++ b/src/capabilities.c @@ -22,8 +22,8 @@ #include "capabilities.h" #include <wocky/wocky.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/channel-manager.h> + +#include <telepathy-glib/telepathy-glib.h> #include "namespaces.h" diff --git a/src/capability-set.c b/src/capability-set.c index 5f1fbe60..f8632691 100644 --- a/src/capability-set.c +++ b/src/capability-set.c @@ -25,11 +25,7 @@ #include <stdlib.h> #include <string.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/channel-manager.h> -#include <telepathy-glib/handle-repo.h> -#include <telepathy-glib/handle-repo-dynamic.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #define DEBUG_FLAG DEBUG_PRESENCE #include "debug.h" diff --git a/src/caps-channel-manager.c b/src/caps-channel-manager.c index c01bfd9e..62f68962 100644 --- a/src/caps-channel-manager.c +++ b/src/caps-channel-manager.c @@ -24,9 +24,7 @@ #include <salut/caps-channel-manager.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/channel-manager.h> - +#include <telepathy-glib/telepathy-glib.h> #define DEBUG_FLAG DEBUG_PRESENCE #include "debug.h" diff --git a/src/connection-contact-info.c b/src/connection-contact-info.c index fb0edf9f..c6dc5599 100644 --- a/src/connection-contact-info.c +++ b/src/connection-contact-info.c @@ -20,10 +20,8 @@ #include "config.h" #include "connection-contact-info.h" -#include <telepathy-glib/interfaces.h> -/* Slightly sketchy; included for TpContactInfoFieldSpec. */ -#include <telepathy-glib/connection.h> -#include <telepathy-glib/gtypes.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include "contact-manager.h" diff --git a/src/connection-manager.c b/src/connection-manager.c index eb5d3664..656b07e2 100644 --- a/src/connection-manager.c +++ b/src/connection-manager.c @@ -26,8 +26,8 @@ #include <stdlib.h> #include <dbus/dbus-protocol.h> -#include <telepathy-glib/util.h> -#include <telepathy-glib/debug-sender.h> + +#include <telepathy-glib/telepathy-glib.h> #include "protocol.h" #include "connection.h" diff --git a/src/connection-manager.h b/src/connection-manager.h index 90e67fed..89f87fc1 100644 --- a/src/connection-manager.h +++ b/src/connection-manager.h @@ -22,7 +22,8 @@ #define __SALUT_CONNECTION_MANAGER_H__ #include <glib-object.h> -#include <telepathy-glib/base-connection-manager.h> + +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/src/connection.c b/src/connection.c index c86261b4..46860deb 100644 --- a/src/connection.c +++ b/src/connection.c @@ -30,16 +30,8 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#include <telepathy-glib/base-contact-list.h> -#include <telepathy-glib/channel-manager.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/handle-repo-dynamic.h> -#include <telepathy-glib/handle-repo.h> -#include <telepathy-glib/handle-repo-static.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/svc-generic.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include <salut/caps-channel-manager.h> #include <salut/plugin-connection.h> diff --git a/src/connection.h b/src/connection.h index 065c4e56..f843ba3a 100644 --- a/src/connection.h +++ b/src/connection.h @@ -26,12 +26,7 @@ #include <glib-object.h> #include <dbus/dbus-glib.h> -#include <telepathy-glib/enums.h> -#include <telepathy-glib/base-connection.h> -#include <telepathy-glib/contacts-mixin.h> -#include <telepathy-glib/dbus-properties-mixin.h> -#include <telepathy-glib/presence-mixin.h> -#include <telepathy-glib/svc-connection.h> +#include <telepathy-glib/telepathy-glib.h> #include <wocky/wocky.h> diff --git a/src/contact-manager.c b/src/contact-manager.c index c6ec5460..f15eda01 100644 --- a/src/contact-manager.c +++ b/src/contact-manager.c @@ -30,8 +30,7 @@ #include "contact.h" #include "enumtypes.h" -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/interfaces.h> +#include <telepathy-glib/telepathy-glib.h> #define DEBUG_FLAG DEBUG_CONTACTS #include "debug.h" diff --git a/src/contact-manager.h b/src/contact-manager.h index 5bb7ca32..cd632c6b 100644 --- a/src/contact-manager.h +++ b/src/contact-manager.h @@ -23,7 +23,7 @@ #include <glib-object.h> -#include <telepathy-glib/base-contact-list.h> +#include <telepathy-glib/telepathy-glib.h> #include "connection.h" #include "contact.h" diff --git a/src/contact.c b/src/contact.c index 197b2807..109c8db8 100644 --- a/src/contact.c +++ b/src/contact.c @@ -28,7 +28,7 @@ #include "presence-cache.h" #include "enumtypes.h" -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #define DEBUG_FLAG DEBUG_CONTACTS #include <debug.h> diff --git a/src/contact.h b/src/contact.h index d1e6c0be..c7ba7461 100644 --- a/src/contact.h +++ b/src/contact.h @@ -22,7 +22,7 @@ #include <glib-object.h> -#include <telepathy-glib/handle-repo.h> +#include <telepathy-glib/telepathy-glib.h> #include <salut/capability-set.h> #include "presence.h" diff --git a/src/debug.c b/src/debug.c index 7c22b045..365cb7d8 100644 --- a/src/debug.c +++ b/src/debug.c @@ -11,8 +11,7 @@ #include <glib.h> #include <glib/gstdio.h> -#include <telepathy-glib/debug.h> -#include <telepathy-glib/debug-sender.h> +#include <telepathy-glib/telepathy-glib.h> #ifdef ENABLE_DEBUG diff --git a/src/disco.c b/src/disco.c index 38c358af..764df146 100644 --- a/src/disco.c +++ b/src/disco.c @@ -28,7 +28,8 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#include <telepathy-glib/dbus.h> + +#include <telepathy-glib/telepathy-glib.h> #define DEBUG_FLAG DEBUG_DISCO diff --git a/src/file-transfer-channel.c b/src/file-transfer-channel.c index 50e01d29..516a71cf 100644 --- a/src/file-transfer-channel.c +++ b/src/file-transfer-channel.c @@ -53,12 +53,8 @@ #include <gibber/gibber-file-transfer.h> #include <gibber/gibber-oob-file-transfer.h> -#include <telepathy-glib/channel-iface.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/svc-generic.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/gnio-util.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> static void file_transfer_iface_init (gpointer g_iface, gpointer iface_data); diff --git a/src/file-transfer-channel.h b/src/file-transfer-channel.h index c3d2aad9..4c09418e 100644 --- a/src/file-transfer-channel.h +++ b/src/file-transfer-channel.h @@ -31,7 +31,7 @@ #include <extensions/_gen/interfaces.h> #include <extensions/_gen/enums.h> -#include <telepathy-glib/base-channel.h> +#include <telepathy-glib/telepathy-glib.h> #include "contact.h" #include "connection.h" diff --git a/src/ft-manager.c b/src/ft-manager.c index 215fa2d6..6c98c2a7 100644 --- a/src/ft-manager.c +++ b/src/ft-manager.c @@ -38,10 +38,8 @@ #include "presence-cache.h" #include "namespaces.h" -#include <telepathy-glib/channel-factory-iface.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/gtypes.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #define DEBUG_FLAG DEBUG_FT #include "debug.h" diff --git a/src/im-channel.c b/src/im-channel.c index dab2b18b..7001cb75 100644 --- a/src/im-channel.c +++ b/src/im-channel.c @@ -33,8 +33,8 @@ #include <netdb.h> #endif -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/interfaces.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include <gibber/gibber-linklocal-transport.h> diff --git a/src/im-channel.h b/src/im-channel.h index a1a3dd01..42bec35a 100644 --- a/src/im-channel.h +++ b/src/im-channel.h @@ -23,8 +23,7 @@ #include <glib-object.h> #include <wocky/wocky.h> -#include <telepathy-glib/base-channel.h> -#include <telepathy-glib/message-mixin.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/src/im-manager.c b/src/im-manager.c index 9fdb7801..0cfa0cbf 100644 --- a/src/im-manager.c +++ b/src/im-manager.c @@ -33,11 +33,8 @@ #include <gibber/gibber-linklocal-transport.h> #include <wocky/wocky.h> -#include <telepathy-glib/channel-manager.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/base-channel.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #define DEBUG_FLAG DEBUG_IM #include "debug.h" diff --git a/src/muc-channel.c b/src/muc-channel.c index f0efbc1d..d1736e40 100644 --- a/src/muc-channel.c +++ b/src/muc-channel.c @@ -38,10 +38,8 @@ #include <wocky/wocky.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/errors.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include <gibber/gibber-bytestream-muc.h> #include <gibber/gibber-muc-connection.h> diff --git a/src/muc-channel.h b/src/muc-channel.h index 868e7af4..07cdfe18 100644 --- a/src/muc-channel.h +++ b/src/muc-channel.h @@ -23,9 +23,7 @@ #include <glib-object.h> -#include <telepathy-glib/base-channel.h> -#include <telepathy-glib/group-mixin.h> -#include <telepathy-glib/message-mixin.h> +#include <telepathy-glib/telepathy-glib.h> #include <gibber/gibber-muc-connection.h> diff --git a/src/muc-manager.c b/src/muc-manager.c index e1cfcd1d..e09b65a2 100644 --- a/src/muc-manager.c +++ b/src/muc-manager.c @@ -43,11 +43,8 @@ #include "tube-stream.h" #include "tube-dbus.h" -#include <telepathy-glib/channel-manager.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #define DEBUG_FLAG DEBUG_MUC #include "debug.h" diff --git a/src/olpc-activity-manager.h b/src/olpc-activity-manager.h index 79686389..1814d1cf 100644 --- a/src/olpc-activity-manager.h +++ b/src/olpc-activity-manager.h @@ -22,7 +22,7 @@ #include <glib-object.h> -#include <telepathy-glib/handle.h> +#include <telepathy-glib/telepathy-glib.h> #include "connection.h" #include "contact.h" diff --git a/src/olpc-activity.h b/src/olpc-activity.h index 2adb6498..25e231af 100644 --- a/src/olpc-activity.h +++ b/src/olpc-activity.h @@ -22,7 +22,7 @@ #include <glib-object.h> -#include <telepathy-glib/handle.h> +#include <telepathy-glib/telepathy-glib.h> #include "connection.h" diff --git a/src/plugin-connection.c b/src/plugin-connection.c index fc36875c..b98e536e 100644 --- a/src/plugin-connection.c +++ b/src/plugin-connection.c @@ -21,7 +21,9 @@ #include "salut/plugin-connection.h" #include <glib-object.h> -#include <telepathy-glib/errors.h> + +#include <telepathy-glib/telepathy-glib.h> + #include <debug.h> /** diff --git a/src/plugin-loader.c b/src/plugin-loader.c index a54fd545..cc86d80a 100644 --- a/src/plugin-loader.c +++ b/src/plugin-loader.c @@ -28,7 +28,7 @@ # include <gmodule.h> #endif -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #define DEBUG_FLAG DEBUG_PLUGIN #include "debug.h" diff --git a/src/plugin-loader.h b/src/plugin-loader.h index bd0c960e..b60cd0b0 100644 --- a/src/plugin-loader.h +++ b/src/plugin-loader.h @@ -22,8 +22,7 @@ #include <glib-object.h> -#include <telepathy-glib/base-connection-manager.h> -#include <telepathy-glib/base-connection.h> +#include <telepathy-glib/telepathy-glib.h> #include <wocky/wocky.h> diff --git a/src/plugin.c b/src/plugin.c index 5d8cd219..dd694b08 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -21,7 +21,7 @@ #include "config.h" #include "salut/plugin.h" -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #define DEBUG_FLAG DEBUG_PLUGINS #include "debug.h" diff --git a/src/presence-cache.c b/src/presence-cache.c index 36e645a4..9d5fc848 100644 --- a/src/presence-cache.c +++ b/src/presence-cache.c @@ -27,8 +27,8 @@ #include <wocky/wocky.h> -#include <telepathy-glib/channel-manager.h> -#include <telepathy-glib/intset.h> +#include <telepathy-glib/telepathy-glib.h> + #include <salut/capabilities.h> #define DEBUG_FLAG DEBUG_PRESENCE diff --git a/src/presence.h b/src/presence.h index 98dc1dd6..993fdf8a 100644 --- a/src/presence.h +++ b/src/presence.h @@ -21,7 +21,8 @@ #define __SALUT_PRESENCE_H__ #include <glib-object.h> -#include <telepathy-glib/enums.h> + +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/src/protocol.c b/src/protocol.c index 2b7fd87b..3b817402 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -22,7 +22,6 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus-protocol.h> -#include <telepathy-glib/base-connection-manager.h> #include <telepathy-glib/telepathy-glib.h> #include "connection.h" diff --git a/src/protocol.h b/src/protocol.h index 5fc96634..8e3b4d5b 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -21,7 +21,8 @@ #define SALUT_PROTOCOL_H #include <glib-object.h> -#include <telepathy-glib/base-protocol.h> + +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/src/roomlist-channel.c b/src/roomlist-channel.c index 3acf1ee1..6ddf9080 100644 --- a/src/roomlist-channel.c +++ b/src/roomlist-channel.c @@ -26,11 +26,9 @@ #include <string.h> #include "connection.h" -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/enums.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/svc-channel.h> + +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #define DEBUG_FLAG DEBUG_ROOMLIST #include "debug.h" diff --git a/src/roomlist-channel.h b/src/roomlist-channel.h index 09da6802..687d563f 100644 --- a/src/roomlist-channel.h +++ b/src/roomlist-channel.h @@ -22,7 +22,7 @@ #include <glib-object.h> -#include <telepathy-glib/base-channel.h> +#include <telepathy-glib/telepathy-glib.h> #include "connection.h" diff --git a/src/roomlist-manager.c b/src/roomlist-manager.c index 9a63a240..d23629ae 100644 --- a/src/roomlist-manager.c +++ b/src/roomlist-manager.c @@ -40,11 +40,8 @@ #include "roomlist-channel.h" #include "discovery-client.h" -#include <telepathy-glib/channel-manager.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/util.h> -#include <telepathy-glib/base-channel.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #define DEBUG_FLAG DEBUG_MUC #include "debug.h" diff --git a/src/salut.c b/src/salut.c index 3c28c0ba..8b7f2893 100644 --- a/src/salut.c +++ b/src/salut.c @@ -2,8 +2,7 @@ #include <glib.h> -#include <telepathy-glib/run.h> -#include <telepathy-glib/debug.h> +#include <telepathy-glib/telepathy-glib.h> #include "connection-manager.h" @@ -37,8 +37,7 @@ #include <gibber/gibber-linklocal-transport.h> #include <gibber/gibber-muc-connection.h> -#include <telepathy-glib/errors.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #include "capabilities.h" #include "contact-manager.h" @@ -24,7 +24,7 @@ #include <glib-object.h> -#include <telepathy-glib/handle-repo.h> +#include <telepathy-glib/telepathy-glib.h> #include <wocky/wocky.h> diff --git a/src/text-helper.c b/src/text-helper.c index 0da4ad1d..b9fe1b91 100644 --- a/src/text-helper.c +++ b/src/text-helper.c @@ -33,9 +33,7 @@ #include <string.h> #include <time.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/errors.h> -#include <telepathy-glib/message-mixin.h> +#include <telepathy-glib/telepathy-glib.h> #define DEBUG_FLAG DEBUG_IM #include "debug.h" diff --git a/src/tube-dbus.c b/src/tube-dbus.c index ee98a455..cc1763d5 100644 --- a/src/tube-dbus.c +++ b/src/tube-dbus.c @@ -31,13 +31,8 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#include <telepathy-glib/channel-iface.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/exportable-channel.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/svc-channel.h> -#include <telepathy-glib/svc-generic.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include <gibber/gibber-bytestream-muc.h> #include <gibber/gibber-muc-connection.h> diff --git a/src/tube-dbus.h b/src/tube-dbus.h index 71b43bb6..71a7658e 100644 --- a/src/tube-dbus.h +++ b/src/tube-dbus.h @@ -22,9 +22,7 @@ #include <glib-object.h> -#include <telepathy-glib/base-channel.h> -#include <telepathy-glib/enums.h> -#include <telepathy-glib/interfaces.h> +#include <telepathy-glib/telepathy-glib.h> #include "connection.h" #include <gibber/gibber-muc-connection.h> diff --git a/src/tube-iface.c b/src/tube-iface.c index e4bc27d3..5381c989 100644 --- a/src/tube-iface.c +++ b/src/tube-iface.c @@ -20,7 +20,8 @@ #include "config.h" #include "tube-iface.h" -#include <telepathy-glib/gtypes.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include "connection.h" diff --git a/src/tube-stream.c b/src/tube-stream.c index 58820c6c..0320a9f8 100644 --- a/src/tube-stream.c +++ b/src/tube-stream.c @@ -42,15 +42,9 @@ #endif #include <glib/gstdio.h> -#include <telepathy-glib/gtypes.h> - -#include <telepathy-glib/channel-iface.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/exportable-channel.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/svc-channel.h> -#include <telepathy-glib/svc-generic.h> + +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include <wocky/wocky.h> diff --git a/src/tube-stream.h b/src/tube-stream.h index 0594d20f..e6c90eae 100644 --- a/src/tube-stream.h +++ b/src/tube-stream.h @@ -22,9 +22,7 @@ #include <glib-object.h> -#include <telepathy-glib/base-channel.h> -#include <telepathy-glib/enums.h> -#include <telepathy-glib/interfaces.h> +#include <telepathy-glib/telepathy-glib.h> #include "extensions/extensions.h" #include "connection.h" diff --git a/src/tubes-manager.c b/src/tubes-manager.c index 04eb89fb..2622e34b 100644 --- a/src/tubes-manager.c +++ b/src/tubes-manager.c @@ -31,10 +31,8 @@ #include <wocky/wocky.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #define DEBUG_FLAG DEBUG_TUBES diff --git a/src/tubes-manager.h b/src/tubes-manager.h index 449f6134..170e7f95 100644 --- a/src/tubes-manager.h +++ b/src/tubes-manager.h @@ -22,7 +22,8 @@ #include <glib-object.h> -#include <telepathy-glib/base-connection.h> +#include <telepathy-glib/telepathy-glib.h> + #include "connection.h" #include "contact-manager.h" @@ -26,7 +26,7 @@ #include <glib.h> #include <glib-object.h> #include <dbus/dbus-glib.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #include "contact.h" |