telepathy-gabble: sidecars: fix enqueuing requests made before connecting

Will Thompson wjt at kemper.freedesktop.org
Mon Nov 5 07:15:16 PST 2012


Module: telepathy-gabble
Branch: master
Commit: 42f4043b305a6e07f8ad87deaf96c6fc6e9f2b59
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=42f4043b305a6e07f8ad87deaf96c6fc6e9f2b59

Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Mon Nov  5 15:12:22 2012 +0000

sidecars: fix enqueuing requests made before connecting

tp_base_connection_get_status() returns DISCONNECTED in two states: when
the connection is yet to connect (internally, it is in state NEW) and
when the connection is defunct. tp_base_connection_is_destroyed() allows
us to distinguish the two in this case. This was introduced in commit
fde8437 and was caught by gateways.py.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=55908

---

 src/conn-sidecars.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/conn-sidecars.c b/src/conn-sidecars.c
index f6842d9..d2dd57e 100644
--- a/src/conn-sidecars.c
+++ b/src/conn-sidecars.c
@@ -210,7 +210,7 @@ gabble_connection_ensure_sidecar (
   gpointer key, value;
   GError *error = NULL;
 
-  if (tp_base_connection_get_status (base) == TP_CONNECTION_STATUS_DISCONNECTED)
+  if (tp_base_connection_is_destroyed (base))
     {
       GError e = { TP_ERROR, TP_ERROR_DISCONNECTED,
           "This connection has already disconnected" };



More information about the telepathy-commits mailing list