diff options
Diffstat (limited to 'libempathy/empathy-dispatch-operation.c')
-rw-r--r-- | libempathy/empathy-dispatch-operation.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/libempathy/empathy-dispatch-operation.c b/libempathy/empathy-dispatch-operation.c index cfe111181..7a116f870 100644 --- a/libempathy/empathy-dispatch-operation.c +++ b/libempathy/empathy-dispatch-operation.c @@ -406,23 +406,6 @@ empathy_dispatcher_operation_tp_chat_ready_cb (GObject *object, } static void -empathy_dispatcher_operation_tp_file_ready_cb (GObject *object, - GParamSpec *spec, gpointer user_data) -{ - EmpathyDispatchOperation *self = EMPATHY_DISPATCH_OPERATION (user_data); - EmpathyDispatchOperationPriv *priv = GET_PRIV (self); - - if (!empathy_tp_file_is_ready (EMPATHY_TP_FILE (priv->channel_wrapper))) - return; - - g_signal_handler_disconnect (priv->channel_wrapper, priv->ready_handler); - priv->ready_handler = 0; - - empathy_dispatch_operation_set_status (self, - EMPATHY_DISPATCHER_OPERATION_STATE_PENDING); -} - -static void empathy_dispatch_operation_channel_ready_cb (TpChannel *channel, const GError *error, gpointer user_data) { @@ -461,15 +444,8 @@ empathy_dispatch_operation_channel_ready_cb (TpChannel *channel, } else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER) { - EmpathyTpFile *file = empathy_tp_file_new (channel); - priv->channel_wrapper = G_OBJECT (file); - - if (!empathy_tp_file_is_ready (file)) - { - priv->ready_handler = g_signal_connect (file, "notify::ready", - G_CALLBACK (empathy_dispatcher_operation_tp_file_ready_cb), self); - return; - } + EmpathyTpFile *file = empathy_tp_file_new (channel, priv->incoming); + priv->channel_wrapper = G_OBJECT (file); } ready: |