diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-09-14 15:52:54 +0200 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-09-17 10:12:54 +0200 |
commit | f9a38137925ff6f712afe21961614a1efb3b35ea (patch) | |
tree | c351d06a4f6762fbf75580fc363961b2790fcee5 /libempathy | |
parent | 55a2318eeb584a744d478d8745ac9fc60c0d4787 (diff) |
include telepathy-glib.h
tp-glib 1.0 will enforce to only include telepathy-glib.h so best doing it to
reduce the delta with the future stable branch.
Diffstat (limited to 'libempathy')
37 files changed, 20 insertions, 80 deletions
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c index 9c25faf0..8731479b 100644 --- a/libempathy/empathy-account-settings.c +++ b/libempathy/empathy-account-settings.c @@ -23,11 +23,6 @@ #include <stdio.h> #include <stdlib.h> -#include <telepathy-glib/account-manager.h> -#include <telepathy-glib/util.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/gtypes.h> - #include "empathy-account-settings.h" #include "empathy-connection-managers.h" #include "empathy-keyring.h" diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h index c5406525..162def48 100644 --- a/libempathy/empathy-account-settings.h +++ b/libempathy/empathy-account-settings.h @@ -24,8 +24,7 @@ #include <glib-object.h> #include <gio/gio.h> -#include <telepathy-glib/account.h> -#include <telepathy-glib/connection-manager.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c index a4bc15a6..f20ce8a3 100644 --- a/libempathy/empathy-auth-factory.c +++ b/libempathy/empathy-auth-factory.c @@ -22,8 +22,6 @@ #include "empathy-auth-factory.h" -#include <telepathy-glib/telepathy-glib.h> - #define DEBUG_FLAG EMPATHY_DEBUG_TLS #include "empathy-debug.h" #include "empathy-keyring.h" diff --git a/libempathy/empathy-auth-factory.h b/libempathy/empathy-auth-factory.h index 5d31b1ed..16d6ad34 100644 --- a/libempathy/empathy-auth-factory.h +++ b/libempathy/empathy-auth-factory.h @@ -23,7 +23,7 @@ #include <glib-object.h> -#include <telepathy-glib/base-client.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-camera-monitor.c b/libempathy/empathy-camera-monitor.c index 977b1f2c..74fdb44d 100644 --- a/libempathy/empathy-camera-monitor.c +++ b/libempathy/empathy-camera-monitor.c @@ -22,7 +22,7 @@ #include <string.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #include "empathy-camera-monitor.h" #include "cheese-camera-device-monitor.h" diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c index 9a9a7b25..da3c4e20 100644 --- a/libempathy/empathy-chatroom-manager.c +++ b/libempathy/empathy-chatroom-manager.c @@ -30,11 +30,6 @@ #include <libxml/parser.h> #include <libxml/tree.h> -#include <telepathy-glib/account-manager.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/simple-observer.h> -#include <telepathy-glib/util.h> - #include "empathy-client-factory.h" #include "empathy-tp-chat.h" #include "empathy-chatroom-manager.h" diff --git a/libempathy/empathy-chatroom-manager.h b/libempathy/empathy-chatroom-manager.h index be330150..b8232dc6 100644 --- a/libempathy/empathy-chatroom-manager.h +++ b/libempathy/empathy-chatroom-manager.h @@ -26,7 +26,7 @@ #include <glib-object.h> -#include <telepathy-glib/account.h> +#include <telepathy-glib/telepathy-glib.h> #include "empathy-chatroom.h" diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c index 5238af36..bfa3280d 100644 --- a/libempathy/empathy-chatroom.c +++ b/libempathy/empathy-chatroom.c @@ -24,7 +24,6 @@ #include <string.h> #include <glib.h> -#include <telepathy-glib/util.h> #include "empathy-chatroom.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h index f86f8ca9..57ca685c 100644 --- a/libempathy/empathy-chatroom.h +++ b/libempathy/empathy-chatroom.h @@ -24,7 +24,7 @@ #include <glib-object.h> -#include <telepathy-glib/account.h> +#include <telepathy-glib/telepathy-glib.h> #include <libempathy/empathy-tp-chat.h> diff --git a/libempathy/empathy-connection-aggregator.c b/libempathy/empathy-connection-aggregator.c index f42e18fd..32a3bbb0 100644 --- a/libempathy/empathy-connection-aggregator.c +++ b/libempathy/empathy-connection-aggregator.c @@ -22,8 +22,6 @@ #include "empathy-connection-aggregator.h" -#include <telepathy-glib/telepathy-glib.h> - #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-connection-aggregator.h b/libempathy/empathy-connection-aggregator.h index 5f85193c..71e6e439 100644 --- a/libempathy/empathy-connection-aggregator.h +++ b/libempathy/empathy-connection-aggregator.h @@ -23,7 +23,7 @@ #include <glib-object.h> -#include <telepathy-glib/base-client.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c index 93985f5d..cd95a4b2 100644 --- a/libempathy/empathy-connection-managers.c +++ b/libempathy/empathy-connection-managers.c @@ -23,9 +23,6 @@ #include <stdio.h> #include <stdlib.h> -#include <telepathy-glib/connection-manager.h> -#include <telepathy-glib/util.h> - #include "empathy-connection-managers.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-connection-managers.h b/libempathy/empathy-connection-managers.h index 14833734..d8bcb390 100644 --- a/libempathy/empathy-connection-managers.h +++ b/libempathy/empathy-connection-managers.h @@ -24,7 +24,7 @@ #include <glib-object.h> #include <gio/gio.h> -#include <telepathy-glib/connection-manager.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 562fba45..4fe42895 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -25,10 +25,6 @@ #include <glib/gi18n-lib.h> -#include <telepathy-glib/account-manager.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/util.h> - #include <folks/folks.h> #include <folks/folks-telepathy.h> diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h index 6b15d5ea..14c3f644 100644 --- a/libempathy/empathy-contact.h +++ b/libempathy/empathy-contact.h @@ -24,8 +24,7 @@ #include <glib-object.h> -#include <telepathy-glib/contact.h> -#include <telepathy-glib/account.h> +#include <telepathy-glib/telepathy-glib.h> #include <telepathy-logger/telepathy-logger.h> #include <folks/folks.h> diff --git a/libempathy/empathy-debug.c b/libempathy/empathy-debug.c index 038748ff..49ee9371 100644 --- a/libempathy/empathy-debug.c +++ b/libempathy/empathy-debug.c @@ -29,9 +29,6 @@ #include <glib.h> #include <glib/gstdio.h> -#include <telepathy-glib/debug.h> -#include <telepathy-glib/debug-sender.h> - #include "empathy-debug.h" #ifdef ENABLE_DEBUG diff --git a/libempathy/empathy-debug.h b/libempathy/empathy-debug.h index 0869e80b..e6b93cc7 100644 --- a/libempathy/empathy-debug.h +++ b/libempathy/empathy-debug.h @@ -25,7 +25,7 @@ #include <glib.h> -#include <telepathy-glib/debug.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c index 169020d5..d9d87e20 100644 --- a/libempathy/empathy-ft-handler.c +++ b/libempathy/empathy-ft-handler.c @@ -25,10 +25,6 @@ #include <glib.h> #include <glib/gi18n-lib.h> -#include <telepathy-glib/account-channel-request.h> -#include <telepathy-glib/util.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/interfaces.h> #include "empathy-ft-handler.h" #include "empathy-time.h" diff --git a/libempathy/empathy-ft-handler.h b/libempathy/empathy-ft-handler.h index 7111cd25..a120f241 100644 --- a/libempathy/empathy-ft-handler.h +++ b/libempathy/empathy-ft-handler.h @@ -27,7 +27,7 @@ #include <glib-object.h> #include <gio/gio.h> -#include <telepathy-glib/file-transfer-channel.h> +#include <telepathy-glib/telepathy-glib.h> #include "empathy-contact.h" diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c index 97be8b8a..8d14cdf0 100644 --- a/libempathy/empathy-individual-manager.c +++ b/libempathy/empathy-individual-manager.c @@ -25,10 +25,6 @@ #include <string.h> #include <telepathy-glib/telepathy-glib.h> -#include <telepathy-glib/account-manager.h> -#include <telepathy-glib/enums.h> -#include <telepathy-glib/proxy-subclass.h> -#include <telepathy-glib/util.h> #include <folks/folks.h> #include <folks/folks-telepathy.h> diff --git a/libempathy/empathy-irc-network.c b/libempathy/empathy-irc-network.c index ec0cfffb..66c1f49d 100644 --- a/libempathy/empathy-irc-network.c +++ b/libempathy/empathy-irc-network.c @@ -25,7 +25,7 @@ #include <glib.h> #include <glib/gi18n-lib.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #include "empathy-irc-network.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-irc-server.c b/libempathy/empathy-irc-server.c index cb1fbfc2..f0a13d09 100644 --- a/libempathy/empathy-irc-server.c +++ b/libempathy/empathy-irc-server.c @@ -24,7 +24,7 @@ #include <glib.h> #include <glib/gi18n-lib.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #include "empathy-irc-server.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-keyring.h b/libempathy/empathy-keyring.h index 05c460e5..7e945dc0 100644 --- a/libempathy/empathy-keyring.h +++ b/libempathy/empathy-keyring.h @@ -21,7 +21,7 @@ #include <gio/gio.h> -#include <telepathy-glib/account.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c index 0a8ca408..fe197511 100644 --- a/libempathy/empathy-message.c +++ b/libempathy/empathy-message.c @@ -28,10 +28,6 @@ #include <glib/gi18n-lib.h> -#include <telepathy-glib/util.h> -#include <telepathy-glib/account.h> -#include <telepathy-glib/account-manager.h> - #include "empathy-client-factory.h" #include "empathy-message.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-message.h b/libempathy/empathy-message.h index c49a2840..fa6e07be 100644 --- a/libempathy/empathy-message.h +++ b/libempathy/empathy-message.h @@ -26,7 +26,7 @@ #define __EMPATHY_MESSAGE_H__ #include <glib-object.h> -#include <telepathy-glib/message.h> +#include <telepathy-glib/telepathy-glib.h> #include <telepathy-logger/telepathy-logger.h> #include "empathy-contact.h" diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c index 29af2a10..25039892 100644 --- a/libempathy/empathy-presence-manager.c +++ b/libempathy/empathy-presence-manager.c @@ -27,10 +27,6 @@ #include <glib/gi18n-lib.h> #include <dbus/dbus-glib.h> -#include <telepathy-glib/account-manager.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/util.h> - #include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER diff --git a/libempathy/empathy-presence-manager.h b/libempathy/empathy-presence-manager.h index 63599cbf..6357aeec 100644 --- a/libempathy/empathy-presence-manager.h +++ b/libempathy/empathy-presence-manager.h @@ -23,8 +23,7 @@ #include <glib.h> -#include <telepathy-glib/account.h> -#include <telepathy-glib/enums.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c index 6b53dab9..196925b5 100644 --- a/libempathy/empathy-request-util.c +++ b/libempathy/empathy-request-util.c @@ -25,8 +25,6 @@ #include <glib/gi18n-lib.h> -#include <telepathy-glib/telepathy-glib.h> - #include "empathy-request-util.h" #include "empathy-utils.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-request-util.h b/libempathy/empathy-request-util.h index cdecc631..497c65ee 100644 --- a/libempathy/empathy-request-util.h +++ b/libempathy/empathy-request-util.h @@ -24,7 +24,7 @@ #include <glib.h> #include <gio/gio.h> -#include <telepathy-glib/channel.h> +#include <telepathy-glib/telepathy-glib.h> #include "empathy-contact.h" diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c index aa0760d6..06f7a9e6 100644 --- a/libempathy/empathy-server-sasl-handler.c +++ b/libempathy/empathy-server-sasl-handler.c @@ -21,8 +21,6 @@ #include "empathy-server-sasl-handler.h" -#include <telepathy-glib/telepathy-glib.h> - #include <extensions/extensions.h> #include <string.h> diff --git a/libempathy/empathy-server-sasl-handler.h b/libempathy/empathy-server-sasl-handler.h index 94be69b1..d25d90ab 100644 --- a/libempathy/empathy-server-sasl-handler.h +++ b/libempathy/empathy-server-sasl-handler.h @@ -23,8 +23,7 @@ #include <glib-object.h> #include <gio/gio.h> -#include <telepathy-glib/account.h> -#include <telepathy-glib/channel.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-status-presets.c b/libempathy/empathy-status-presets.c index 319ca53d..94025334 100644 --- a/libempathy/empathy-status-presets.c +++ b/libempathy/empathy-status-presets.c @@ -32,8 +32,6 @@ #include <libxml/parser.h> #include <libxml/tree.h> -#include <telepathy-glib/util.h> - #include "empathy-utils.h" #include "empathy-status-presets.h" diff --git a/libempathy/empathy-status-presets.h b/libempathy/empathy-status-presets.h index 331c630d..5e490221 100644 --- a/libempathy/empathy-status-presets.h +++ b/libempathy/empathy-status-presets.h @@ -23,7 +23,7 @@ #ifndef __EMPATHY_STATUS_PRESETS_H__ #define __EMPATHY_STATUS_PRESETS_H__ -#include <telepathy-glib/enums.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index d6a0e13c..39ed8e2a 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -22,8 +22,6 @@ #include <string.h> -#include <telepathy-glib/telepathy-glib.h> - #include <extensions/extensions.h> #include "empathy-tp-chat.h" diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h index 66fb96d7..d8d4ac31 100644 --- a/libempathy/empathy-tp-chat.h +++ b/libempathy/empathy-tp-chat.h @@ -23,8 +23,7 @@ #include <glib.h> -#include <telepathy-glib/channel.h> -#include <telepathy-glib/enums.h> +#include <telepathy-glib/telepathy-glib.h> #include "empathy-message.h" #include "empathy-contact.h" diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index eb1e27f4..e33bf3af 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -42,12 +42,6 @@ #include <dbus/dbus-protocol.h> -#include <telepathy-glib/account-manager.h> -#include <telepathy-glib/connection.h> -#include <telepathy-glib/channel.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/util.h> - #include "empathy-client-factory.h" #include "empathy-utils.h" #include "empathy-individual-manager.h" diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h index c3a5886a..a310d2b0 100644 --- a/libempathy/empathy-utils.h +++ b/libempathy/empathy-utils.h @@ -34,7 +34,7 @@ #include <libxml/tree.h> #include <folks/folks.h> #include <folks/folks-telepathy.h> -#include <telepathy-glib/account-manager.h> +#include <telepathy-glib/telepathy-glib.h> #include "empathy-contact.h" |