summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.com>2012-03-28 15:16:15 -0400
committerNicolas Dufresne <nicolas.dufresne@collabora.com>2012-03-28 15:16:15 -0400
commitd834c43aff5c92a9b61723c8812c0cd536542513 (patch)
tree39c221d6e45e13e38160aef4ea27091692fd0846 /src
parentfcf24e9575f05d7cdb08a1073d58f36d120ccd79 (diff)
downloadtelepathy-logger-d834c43aff5c92a9b61723c8812c0cd536542513.tar.gz
Port TplCallChannel to Call1 API
This include a API break in the unstable Call code. Code using the unstable call log feature will need porting.
Diffstat (limited to 'src')
-rw-r--r--src/telepathy-logger.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/telepathy-logger.c b/src/telepathy-logger.c
index 25df9fe..1b39952 100644
--- a/src/telepathy-logger.c
+++ b/src/telepathy-logger.c
@@ -28,11 +28,8 @@
#include <telepathy-logger/text-channel-internal.h>
#include <telepathy-logger/observer-internal.h>
#include <telepathy-logger/dbus-service-internal.h>
-
-#ifdef ENABLE_CALL
#include <telepathy-logger/call-channel-internal.h>
#include <telepathy-logger/streamed-media-channel-internal.h>
-#endif /* ENABLE_CALL */
#define DEBUG_FLAG TPL_DEBUG_MAIN
#include <telepathy-logger/debug-internal.h>
@@ -165,16 +162,13 @@ main (int argc,
(TplChannelConstructor) _tpl_text_channel_new);
DEBUG ("- TplTextChannel registered.");
-#ifdef ENABLE_CALL
_tpl_channel_factory_add ("org.freedesktop.Telepathy.Channel.Type.StreamedMedia",
(TplChannelConstructor) _tpl_streamed_media_channel_new);
DEBUG ("- TplStreamedMediaChannel registered.");
- _tpl_channel_factory_add ("org.freedesktop.Telepathy.Channel.Type.Call.DRAFT",
+ _tpl_channel_factory_add ("org.freedesktop.Telepathy.Channel.Type.Call1",
(TplChannelConstructor) _tpl_call_channel_new);
DEBUG ("- TplCallChannel registered.");
-#endif /* ENABLE_CALL */
-
observer = _tpl_observer_dup (&error);