From 7ba840f00ea11fa3f6458ab159b86ec37f99f451 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 9 Jan 2009 16:16:58 +0000 Subject: If channel is invalidated before being ready, the error is handled in invalidated_cb, so we can return directly in ready_cb. svn path=/trunk/; revision=2217 --- libempathy/empathy-dispatch-operation.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libempathy') diff --git a/libempathy/empathy-dispatch-operation.c b/libempathy/empathy-dispatch-operation.c index a6fb3b3a5..f035975ad 100644 --- a/libempathy/empathy-dispatch-operation.c +++ b/libempathy/empathy-dispatch-operation.c @@ -370,6 +370,10 @@ empathy_dispatch_operation_channel_ready_cb (TpChannel *channel, EmpathyDispatchOperationPriv *priv = GET_PRIV (self); GQuark channel_type; + /* The error will be handled in empathy_dispatch_operation_invalidated */ + if (error != NULL) + return; + g_assert (channel == priv->channel); /* If the channel wrapper is defined, we assume it's ready */ -- cgit v1.2.3