[Telepathy-commits] [telepathy-glib/master] tp_connection_manager_end_introspection: always emit got-info

[Simon McVittie]

Either we succeeded (so we should tell the user), or we failed and
have no cached info (so we should tell the user to stop waiting),
or we failed but already had cached info (so there's no harm in
telling the user).

This appears to fix the fact that got-info was not always emitted.
---
 telepathy-glib/connection-manager.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
index 5437858..63a4653 100644
--- a/telepathy-glib/connection-manager.c
+++ b/telepathy-glib/connection-manager.c
@@ -334,7 +334,6 @@ tp_connection_manager_free_protocols (GPtrArray *protocols)
 static void
 tp_connection_manager_end_introspection (TpConnectionManager *self)
 {
-  gboolean emit = self->priv->listing_protocols;
   guint i;
 
   self->priv->listing_protocols = FALSE;
@@ -347,8 +346,6 @@ tp_connection_manager_end_introspection (TpConnectionManager *self)
 
   if (self->priv->pending_protocols != NULL)
     {
-      emit = TRUE;
-
       for (i = 0; i < self->priv->pending_protocols->len; i++)
         g_free (self->priv->pending_protocols->pdata[i]);
 
@@ -356,8 +353,7 @@ tp_connection_manager_end_introspection (TpConnectionManager *self)
       self->priv->pending_protocols = NULL;
     }
 
-  if (emit)
-    g_signal_emit (self, signals[SIGNAL_GOT_INFO], 0, self->info_source);
+  g_signal_emit (self, signals[SIGNAL_GOT_INFO], 0, self->info_source);
 }
 
 static void
-- 
1.5.6.5