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 /libempathy/empathy-dispatch-operation.c | |
| 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 'libempathy/empathy-dispatch-operation.c')
| -rw-r--r-- | libempathy/empathy-dispatch-operation.c | 30 |
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); |