[Telepathy-commits] [telepathy-glib/master] TpConnectionManager: only end introspection in response to NameOwnerChanged if it's running

[Simon McVittie]

Otherwise, we can emit spurious got-info signals with argument NONE
when discovering that the CM doesn't exist.
---
 telepathy-glib/connection-manager.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
index f3c21e7..b24a96d 100644
--- a/telepathy-glib/connection-manager.c
+++ b/telepathy-glib/connection-manager.c
@@ -626,7 +626,9 @@ tp_connection_manager_name_owner_changed_cb (TpDBusDaemon *bus,
       self->running = FALSE;
 
       /* cancel pending introspection, if any */
-      tp_connection_manager_end_introspection (self, &e);
+      if (self->priv->listing_protocols ||
+          self->priv->pending_protocols != NULL)
+        tp_connection_manager_end_introspection (self, &e);
 
       g_signal_emit (self, signals[SIGNAL_EXITED], 0);
     }
-- 
1.5.6.5