aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-07 18:24:06 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-07 18:26:05 +0800
commit63b5db096a4a8e706bf9d2b7043aa6c9fe5d5697 (patch)
treef34aaeb08423a55f76182deaa1db2b47a65c2533
parent78a90f6800c2403452712d0a85d0c89a5cc165ea (diff)
downloadgsoc2013-empathy-63b5db096a4a8e706bf9d2b7043aa6c9fe5d5697.tar
gsoc2013-empathy-63b5db096a4a8e706bf9d2b7043aa6c9fe5d5697.tar.gz
gsoc2013-empathy-63b5db096a4a8e706bf9d2b7043aa6c9fe5d5697.tar.bz2
gsoc2013-empathy-63b5db096a4a8e706bf9d2b7043aa6c9fe5d5697.tar.lz
gsoc2013-empathy-63b5db096a4a8e706bf9d2b7043aa6c9fe5d5697.tar.xz
gsoc2013-empathy-63b5db096a4a8e706bf9d2b7043aa6c9fe5d5697.tar.zst
gsoc2013-empathy-63b5db096a4a8e706bf9d2b7043aa6c9fe5d5697.zip
dispatch-operation: factor out channel_wrapper_ready
-rw-r--r--libempathy/empathy-dispatch-operation.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/libempathy/empathy-dispatch-operation.c b/libempathy/empathy-dispatch-operation.c
index f6cc0d6ef..68143c55b 100644
--- a/libempathy/empathy-dispatch-operation.c
+++ b/libempathy/empathy-dispatch-operation.c
@@ -433,6 +433,18 @@ empathy_dispatch_operation_set_status (EmpathyDispatchOperation *self,
}
static void
+channel_wrapper_ready (EmpathyDispatchOperation *self)
+{
+ EmpathyDispatchOperationPriv *priv = GET_PRIV (self);
+
+ 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_dispatcher_operation_tp_chat_ready_cb (GObject *object,
GParamSpec *spec, gpointer user_data)
{
@@ -442,11 +454,7 @@ empathy_dispatcher_operation_tp_chat_ready_cb (GObject *object,
if (!empathy_tp_chat_is_ready (EMPATHY_TP_CHAT (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);
+ channel_wrapper_ready (self);
}
static void