diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-16 16:16:45 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-16 16:16:45 +0200 |
| commit | 7fe6cfdde358a717e3c8dc163961404174f52599 (patch) | |
| tree | c136e0ac8ee6337da68bf0563ca4693d850cb4a2 /src | |
| parent | 71b6299797afef28d363e4facf6858bf61c9594a (diff) | |
use TP_DISABLE_SINGLE_INCLUDE
Diffstat (limited to 'src')
| -rw-r--r-- | src/protocol.h | 2 | ||||
| -rw-r--r-- | src/sip-connection-helpers.c | 6 | ||||
| -rw-r--r-- | src/sip-connection-manager.c | 4 | ||||
| -rw-r--r-- | src/sip-connection-manager.h | 2 | ||||
| -rw-r--r-- | src/sip-connection-private.h | 2 | ||||
| -rw-r--r-- | src/sip-connection.c | 8 | ||||
| -rw-r--r-- | src/sip-connection.h | 2 | ||||
| -rw-r--r-- | src/telepathy-rakia.c | 3 |
8 files changed, 6 insertions, 23 deletions
diff --git a/src/protocol.h b/src/protocol.h index a7e9b25..ccf8c27 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -21,7 +21,7 @@ #define RAKIA_PROTOCOL_H #include <glib-object.h> -#include <telepathy-glib/base-protocol.h> +#include <telepathy-glib/telepathy-glib.h> #include <rakia/sofia-decls.h> #include <sofia-sip/su_glib.h> diff --git a/src/sip-connection-helpers.c b/src/sip-connection-helpers.c index 74524f7..794bbf9 100644 --- a/src/sip-connection-helpers.c +++ b/src/sip-connection-helpers.c @@ -24,11 +24,7 @@ #include <string.h> #include <ctype.h> -#include <telepathy-glib/enums.h> -#include <telepathy-glib/errors.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/svc-connection.h> +#include <telepathy-glib/telepathy-glib.h> #include <rakia/util.h> #include <rakia/handles.h> diff --git a/src/sip-connection-manager.c b/src/sip-connection-manager.c index 697417f..b0924a2 100644 --- a/src/sip-connection-manager.c +++ b/src/sip-connection-manager.c @@ -31,10 +31,6 @@ #include <dbus/dbus-protocol.h> -#include <telepathy-glib/debug-sender.h> -#include <telepathy-glib/errors.h> -#include <telepathy-glib/svc-connection-manager.h> - #include <rakia/sofia-decls.h> #include <sofia-sip/su_glib.h> #include <sofia-sip/su_log.h> diff --git a/src/sip-connection-manager.h b/src/sip-connection-manager.h index ed89900..cce2ec7 100644 --- a/src/sip-connection-manager.h +++ b/src/sip-connection-manager.h @@ -23,7 +23,7 @@ #include <glib-object.h> -#include <telepathy-glib/base-connection-manager.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/src/sip-connection-private.h b/src/sip-connection-private.h index 9a572aa..9427525 100644 --- a/src/sip-connection-private.h +++ b/src/sip-connection-private.h @@ -27,7 +27,7 @@ #include <rakia/sofia-decls.h> #include <sofia-sip/sresolv.h> -#include <telepathy-glib/simple-password-manager.h> +#include <telepathy-glib/telepathy-glib.h> #ifdef HAVE_LIBIPHB #include <iphbd/libiphb.h> diff --git a/src/sip-connection.c b/src/sip-connection.c index 91b0e8e..f0ea3ed 100644 --- a/src/sip-connection.c +++ b/src/sip-connection.c @@ -29,14 +29,6 @@ #include <stdlib.h> #include <string.h> -#include <telepathy-glib/enums.h> -#include <telepathy-glib/errors.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/handle-repo-dynamic.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/svc-connection.h> -#include <telepathy-glib/svc-generic.h> - #include <rakia/event-target.h> #include <rakia/handles.h> #include <rakia/connection-aliasing.h> diff --git a/src/sip-connection.h b/src/sip-connection.h index 8f26bd5..1ebab77 100644 --- a/src/sip-connection.h +++ b/src/sip-connection.h @@ -24,7 +24,7 @@ #include <glib-object.h> #include <rakia/base-connection.h> -#include <telepathy-glib/dbus-properties-mixin.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/src/telepathy-rakia.c b/src/telepathy-rakia.c index 305fd43..efc4234 100644 --- a/src/telepathy-rakia.c +++ b/src/telepathy-rakia.c @@ -32,8 +32,7 @@ #include <dbus/dbus.h> -#include <telepathy-glib/run.h> -#include <telepathy-glib/debug.h> +#include <telepathy-glib/telepathy-glib.h> static TpBaseConnectionManager * construct_cm (void) |