summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2011-10-13 18:43:30 -0400
committerXavier Claessens <xclaesse@gmail.com>2011-11-28 16:08:12 +0100
commit298083e9ca93cb328501f5dae8131d1f8cfc610d (patch)
treebffe7257c73ee13af559a36d7a875faa233592fe /examples
parente225393827e6355ba9e29450e9fb4a878f519e23 (diff)
Port to Call1
Diffstat (limited to 'examples')
-rw-r--r--examples/call-handler.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/examples/call-handler.c b/examples/call-handler.c
index 5385a26..98c8be9 100644
--- a/examples/call-handler.c
+++ b/examples/call-handler.c
@@ -19,7 +19,6 @@
#include <gst/gst.h>
#include <telepathy-glib/telepathy-glib.h>
-#include <extensions/extensions.h>
#include <farstream/fs-element-added-notifier.h>
#include <farstream/fs-utils.h>
#include <telepathy-farstream/telepathy-farstream.h>
@@ -463,7 +462,7 @@ new_call_channel_cb (TpSimpleHandler *handler,
tp_handle_channels_context_accept (handler_context);
- tf_future_cli_channel_type_call_call_accept (proxy, -1,
+ tp_cli_channel_type_call_call_accept (proxy, -1,
NULL, NULL, NULL, NULL);
context->proxy = g_object_ref (proxy);
@@ -498,28 +497,28 @@ main (int argc, char **argv)
tp_base_client_take_handler_filter (client,
tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TF_FUTURE_IFACE_CHANNEL_TYPE_CALL,
+ TP_IFACE_CHANNEL_TYPE_CALL,
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
TP_HANDLE_TYPE_CONTACT,
- TF_FUTURE_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN,
+ TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN,
TRUE,
NULL));
tp_base_client_take_handler_filter (client,
tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TF_FUTURE_IFACE_CHANNEL_TYPE_CALL,
+ TP_IFACE_CHANNEL_TYPE_CALL,
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
TP_HANDLE_TYPE_CONTACT,
- TF_FUTURE_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, G_TYPE_BOOLEAN,
+ TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, G_TYPE_BOOLEAN,
TRUE,
NULL));
tp_base_client_add_handler_capabilities_varargs (client,
- TF_FUTURE_IFACE_CHANNEL_TYPE_CALL "/video/h264",
- TF_FUTURE_IFACE_CHANNEL_TYPE_CALL "/shm",
- TF_FUTURE_IFACE_CHANNEL_TYPE_CALL "/ice",
- TF_FUTURE_IFACE_CHANNEL_TYPE_CALL "/gtalk-p2p",
+ TP_IFACE_CHANNEL_TYPE_CALL "/video/h264",
+ TP_IFACE_CHANNEL_TYPE_CALL "/shm",
+ TP_IFACE_CHANNEL_TYPE_CALL "/ice",
+ TP_IFACE_CHANNEL_TYPE_CALL "/gtalk-p2p",
NULL);
tp_base_client_register (client, NULL);