aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-21 19:14:35 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-22 15:31:27 +0800
commitf43fbe8cdb7adf761c2b23206b4c13ee5efc3332 (patch)
treeca5e499e4861b74c63f071a541bea32a75645201 /src
parent6d577ec2bc68b365aa0b02235d8b1d8d1aac297c (diff)
downloadgsoc2013-empathy-f43fbe8cdb7adf761c2b23206b4c13ee5efc3332.tar
gsoc2013-empathy-f43fbe8cdb7adf761c2b23206b4c13ee5efc3332.tar.gz
gsoc2013-empathy-f43fbe8cdb7adf761c2b23206b4c13ee5efc3332.tar.bz2
gsoc2013-empathy-f43fbe8cdb7adf761c2b23206b4c13ee5efc3332.tar.lz
gsoc2013-empathy-f43fbe8cdb7adf761c2b23206b4c13ee5efc3332.tar.xz
gsoc2013-empathy-f43fbe8cdb7adf761c2b23206b4c13ee5efc3332.tar.zst
gsoc2013-empathy-f43fbe8cdb7adf761c2b23206b4c13ee5efc3332.zip
stop handling internally stream media channels
We are going to do it properly using TpSimpleHandler.
Diffstat (limited to 'src')
-rw-r--r--src/empathy.c36
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);