diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-06-22 23:26:10 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-06-22 23:26:10 +0800 |
| commit | 09df593e038c3f7bfed05294155dbffeabba6ea0 (patch) | |
| tree | 8c6fd98335639d995b0bf0a84ebb419221529b5c /src | |
| parent | 603a22855ea710b276892654b86a529167f8d32b (diff) | |
| parent | 89ca74a938a753c1137cc9f008619805622e490c (diff) | |
| download | gsoc2013-empathy-09df593e038c3f7bfed05294155dbffeabba6ea0.tar gsoc2013-empathy-09df593e038c3f7bfed05294155dbffeabba6ea0.tar.gz gsoc2013-empathy-09df593e038c3f7bfed05294155dbffeabba6ea0.tar.bz2 gsoc2013-empathy-09df593e038c3f7bfed05294155dbffeabba6ea0.tar.lz gsoc2013-empathy-09df593e038c3f7bfed05294155dbffeabba6ea0.tar.xz gsoc2013-empathy-09df593e038c3f7bfed05294155dbffeabba6ea0.tar.zst gsoc2013-empathy-09df593e038c3f7bfed05294155dbffeabba6ea0.zip | |
Merge branch 'av-handler-622368'
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy.c | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/src/empathy.c b/src/empathy.c index 2c7ea2a7f..85c0ea8b7 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -140,13 +140,6 @@ dispatch_cb (EmpathyDispatcher *dispatcher, empathy_dispatch_operation_claim (operation); } - else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA) - { - EmpathyCallFactory *factory; - - factory = empathy_call_factory_get (); - empathy_call_factory_claim_channel (factory, operation); - } else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER) { EmpathyFTFactory *factory; @@ -396,15 +389,9 @@ setup_dispatcher (void) { TP_IFACE_CHANNEL_TYPE_TEXT, TP_HANDLE_TYPE_ROOM }, /* file transfer to contacts */ { TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, TP_HANDLE_TYPE_CONTACT }, - /* stream media to contacts */ - { TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA, TP_HANDLE_TYPE_CONTACT }, /* roomlists */ { TP_IFACE_CHANNEL_TYPE_ROOM_LIST, TP_HANDLE_TYPE_NONE }, }; - gchar *capabilities[] = { - "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/ice-udp", - "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/gtalk-p2p", - NULL }; GHashTable *asv; guint i; @@ -435,29 +422,8 @@ setup_dispatcher (void) g_ptr_array_add (filters, asv); } - asv = tp_asv_new ( - TP_IFACE_CHANNEL ".ChannelType", - G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA, - TP_IFACE_CHANNEL ".TargetHandleType", - G_TYPE_INT, TP_HANDLE_TYPE_CONTACT, - TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialAudio", - G_TYPE_BOOLEAN, TRUE, - NULL); - g_ptr_array_add (filters, asv); - - asv = tp_asv_new ( - TP_IFACE_CHANNEL ".ChannelType", - G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA, - TP_IFACE_CHANNEL ".TargetHandleType", - G_TYPE_INT, TP_HANDLE_TYPE_CONTACT, - TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialVideo", - G_TYPE_BOOLEAN, TRUE, - NULL); - g_ptr_array_add (filters, asv); - - empathy_dispatcher_add_handler (d, PACKAGE_NAME"MoreThanMeetsTheEye", - filters, capabilities); + filters, NULL); g_ptr_array_foreach (filters, (GFunc) g_hash_table_destroy, NULL); g_ptr_array_free (filters, TRUE); |