diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-04-27 16:04:35 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-04-30 18:48:41 +0100 |
| commit | b613ceb06854593bd7a78ca8d635d379a3a4bb6f (patch) | |
| tree | ac93b838a5e271c43de2102a59513e1b10de67fc | |
| parent | 620bc9380a2c5ab14e8198248b91c24db1ffb7ff (diff) | |
Move Call1 Content/Stream client code to -dbus library
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46835
| -rw-r--r-- | telepathy-glib/call-content.c | 2 | ||||
| -rw-r--r-- | telepathy-glib/call-misc.c | 3 | ||||
| -rw-r--r-- | telepathy-glib/call-stream.c | 2 | ||||
| -rw-r--r-- | telepathy-glib/cli-misc.c | 5 |
4 files changed, 5 insertions, 7 deletions
diff --git a/telepathy-glib/call-content.c b/telepathy-glib/call-content.c index de151143b..757de89ea 100644 --- a/telepathy-glib/call-content.c +++ b/telepathy-glib/call-content.c @@ -67,8 +67,6 @@ #include "telepathy-glib/proxy-internal.h" #include "telepathy-glib/util-internal.h" -#include "_gen/tp-cli-call-content-body.h" - G_DEFINE_TYPE (TpCallContent, tp_call_content, TP_TYPE_PROXY) typedef struct _SendTonesData SendTonesData; diff --git a/telepathy-glib/call-misc.c b/telepathy-glib/call-misc.c index 22c5beee1..aee48f1f8 100644 --- a/telepathy-glib/call-misc.c +++ b/telepathy-glib/call-misc.c @@ -36,9 +36,6 @@ #include "telepathy-glib/interfaces.h" #include "telepathy-glib/proxy-subclass.h" -#include "_gen/tp-cli-call-content-media-description-body.h" -#include "_gen/tp-cli-call-stream-endpoint-body.h" - /** * tp_call_stream_endpoint_init_known_interfaces: * diff --git a/telepathy-glib/call-stream.c b/telepathy-glib/call-stream.c index 7ead22462..41362166b 100644 --- a/telepathy-glib/call-stream.c +++ b/telepathy-glib/call-stream.c @@ -65,8 +65,6 @@ #include "telepathy-glib/proxy-internal.h" #include "telepathy-glib/util-internal.h" -#include "_gen/tp-cli-call-stream-body.h" - G_DEFINE_TYPE (TpCallStream, tp_call_stream, TP_TYPE_PROXY) struct _TpCallStreamPrivate diff --git a/telepathy-glib/cli-misc.c b/telepathy-glib/cli-misc.c index 9cca3ae70..e65334ec5 100644 --- a/telepathy-glib/cli-misc.c +++ b/telepathy-glib/cli-misc.c @@ -21,6 +21,7 @@ #include "config.h" +#include <telepathy-glib/cli-call.h> #include <telepathy-glib/cli-misc.h> #include <telepathy-glib/interfaces.h> @@ -28,6 +29,10 @@ #include "telepathy-glib/_gen/tp-cli-account-body.h" #include "telepathy-glib/_gen/tp-cli-account-manager-body.h" +#include "telepathy-glib/_gen/tp-cli-call-content-body.h" +#include "telepathy-glib/_gen/tp-cli-call-content-media-description-body.h" +#include "telepathy-glib/_gen/tp-cli-call-stream-body.h" +#include "telepathy-glib/_gen/tp-cli-call-stream-endpoint-body.h" #include "telepathy-glib/_gen/tp-cli-channel-dispatcher-body.h" #include "telepathy-glib/_gen/tp-cli-channel-dispatch-operation-body.h" #include "telepathy-glib/_gen/tp-cli-channel-request-body.h" |