[telepathy-salut/master] salut_disco_dispose: unref the XCM after canceling request as we could need it to release a connection

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Wed Apr 1 04:10:39 PDT 2009


---
 src/salut-disco.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/salut-disco.c b/src/salut-disco.c
index 101f53b..d39a8ac 100644
--- a/src/salut-disco.c
+++ b/src/salut-disco.c
@@ -607,6 +607,10 @@ salut_disco_dispose (GObject *object)
       priv->xmpp_connection_manager, NULL,
       caps_req_stanza_filter, caps_req_stanza_callback, self);
 
+  /* cancel request removes the element from the list after cancelling */
+  while (priv->requests)
+    cancel_request (priv->requests->data);
+
   if (priv->xmpp_connection_manager != NULL)
     {
       g_signal_handlers_disconnect_matched (priv->xmpp_connection_manager,
@@ -616,10 +620,6 @@ salut_disco_dispose (GObject *object)
       priv->xmpp_connection_manager = NULL;
     }
 
-  /* cancel request removes the element from the list after cancelling */
-  while (priv->requests)
-    cancel_request (priv->requests->data);
-
   if (G_OBJECT_CLASS (salut_disco_parent_class)->dispose)
     G_OBJECT_CLASS (salut_disco_parent_class)->dispose (object);
 }
-- 
1.5.6.5




More information about the telepathy-commits mailing list