diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2009-01-10 00:16:58 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2009-01-10 00:16:58 +0800 |
| commit | 7ba840f00ea11fa3f6458ab159b86ec37f99f451 (patch) | |
| tree | 9a62db25016a4ae9bd4364b39e34ee89e821e5b6 | |
| parent | cf09967694336a3bd6120c5f3b1004272ed34183 (diff) | |
| download | gsoc2013-empathy-7ba840f00ea11fa3f6458ab159b86ec37f99f451.tar gsoc2013-empathy-7ba840f00ea11fa3f6458ab159b86ec37f99f451.tar.gz gsoc2013-empathy-7ba840f00ea11fa3f6458ab159b86ec37f99f451.tar.bz2 gsoc2013-empathy-7ba840f00ea11fa3f6458ab159b86ec37f99f451.tar.lz gsoc2013-empathy-7ba840f00ea11fa3f6458ab159b86ec37f99f451.tar.xz gsoc2013-empathy-7ba840f00ea11fa3f6458ab159b86ec37f99f451.tar.zst gsoc2013-empathy-7ba840f00ea11fa3f6458ab159b86ec37f99f451.zip | |
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
| -rw-r--r-- | libempathy/empathy-dispatch-operation.c | 4 |
1 files changed, 4 insertions, 0 deletions
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 */ |