[next] telepathy-glib: TpConnectionManager: fix infinite loop in introspection

Xavier Claessens xclaesse at kemper.freedesktop.org
Thu May 3 11:49:52 PDT 2012


Module: telepathy-glib
Branch: next
Commit: ff68088d70bbe0dcabf34fe045b76bc02a11d37f
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=ff68088d70bbe0dcabf34fe045b76bc02a11d37f

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Thu May  3 20:22:08 2012 +0200

TpConnectionManager: fix infinite loop in introspection

---

 telepathy-glib/connection-manager.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
index 5bb72e9..375ddde 100644
--- a/telepathy-glib/connection-manager.c
+++ b/telepathy-glib/connection-manager.c
@@ -556,6 +556,8 @@ tp_connection_manager_get_all_cb (TpProxy *proxy,
                 }
             }
         }
+
+      tp_connection_manager_continue_introspection (self);
     }
   else
     {
@@ -571,8 +573,6 @@ tp_connection_manager_get_all_cb (TpProxy *proxy,
 
       tp_connection_manager_end_introspection (self, error);
     }
-
-  tp_connection_manager_continue_introspection (self);
 }
 
 static void



More information about the telepathy-commits mailing list