From 2616a960b79819fa3e9b12db7b8ae169be9158a1 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 27 Apr 2012 16:04:35 +0100 Subject: [PATCH 6/6] Move Call1 Content/Stream client code to -dbus library --- telepathy-glib/call-content.c | 2 -- telepathy-glib/call-misc.c | 3 --- telepathy-glib/call-stream.c | 2 -- 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 de15114..757de89 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 22c5bee..aee48f1 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 7ead224..4136216 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 9cca3ae..e65334e 100644 --- a/telepathy-glib/cli-misc.c +++ b/telepathy-glib/cli-misc.c @@ -21,6 +21,7 @@ #include "config.h" +#include #include #include @@ -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" -- 1.7.10