empathy r2217 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Jan  9 16:16:58 2009
New Revision: 2217
URL: http://svn.gnome.org/viewvc/empathy?rev=2217&view=rev

Log:
If channel is invalidated before being ready, the error is handled in invalidated_cb, so we can return directly in ready_cb.

Modified:
   trunk/libempathy/empathy-dispatch-operation.c

Modified: trunk/libempathy/empathy-dispatch-operation.c
==============================================================================
--- trunk/libempathy/empathy-dispatch-operation.c	(original)
+++ trunk/libempathy/empathy-dispatch-operation.c	Fri Jan  9 16:16:58 2009
@@ -370,6 +370,10 @@
   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 */