aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
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 /libempathy
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 'libempathy')
-rw-r--r--libempathy/empathy-dispatch-operation.c30
1 files changed, 0 insertions, 30 deletions
diff --git a/libempathy/empathy-dispatch-operation.c b/libempathy/empathy-dispatch-operation.c
index 83cf72483..65fe4b17b 100644
--- a/libempathy/empathy-dispatch-operation.c
+++ b/libempathy/empathy-dispatch-operation.c
@@ -442,17 +442,6 @@ empathy_dispatcher_operation_tp_chat_ready_cb (GObject *object,
}
static void
-call_status_changed_cb (EmpathyTpCall *call,
- GParamSpec *spec,
- EmpathyDispatchOperation *self)
-{
- if (empathy_tp_call_get_status (call) <= EMPATHY_TP_CALL_STATUS_READYING)
- return;
-
- channel_wrapper_ready (self);
-}
-
-static void
empathy_dispatch_operation_channel_ready_cb (TpChannel *channel,
const GError *error, gpointer user_data)
{
@@ -488,25 +477,6 @@ empathy_dispatch_operation_channel_ready_cb (TpChannel *channel,
goto out;
}
}
- else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA)
- {
- gboolean requested;
- EmpathyTpCall *call = empathy_tp_call_new (channel);
- priv->channel_wrapper = G_OBJECT (call);
-
- requested = tp_asv_get_boolean (tp_channel_borrow_immutable_properties (
- channel), TP_PROP_CHANNEL_REQUESTED, NULL);
-
- if (!requested &&
- empathy_tp_call_get_status (call) <= EMPATHY_TP_CALL_STATUS_READYING)
- {
- /* For incoming calls, we have to wait that the TpCall is ready as
- * the call-handler rely on it. */
- priv->ready_handler = g_signal_connect (call,
- "notify::status", G_CALLBACK (call_status_changed_cb), self);
- goto out;
- }
- }
else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER)
{
EmpathyTpFile *file = empathy_tp_file_new (channel, priv->incoming);