[Telepathy-commits] [telepathy-glib/master] TpConnectionManager: if there's no .manager file or we fail to parse it, try activating the CM

[Simon McVittie]

---
 telepathy-glib/connection-manager.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
index 36f46c6..12b7b02 100644
--- a/telepathy-glib/connection-manager.c
+++ b/telepathy-glib/connection-manager.c
@@ -970,14 +970,22 @@ tp_connection_manager_idle_read_manager_file (gpointer data)
               self->info_source = TP_CM_INFO_SOURCE_FILE;
               self->protocols = (const TpConnectionManagerProtocol * const *)
                   self->priv->protocols->pdata;
-            }
 
-          g_signal_emit (self, signals[SIGNAL_GOT_INFO], 0, self->info_source);
+              g_signal_emit (self, signals[SIGNAL_GOT_INFO], 0,
+                  self->info_source);
+            }
         }
-      else if (self->priv->introspect_idle_id == 0)
+
+      if (self->priv->introspect_idle_id == 0)
         {
+          DEBUG ("no .manager file or failed to parse it, trying to activate "
+              "CM instead");
           tp_connection_manager_idle_introspect (self);
         }
+      else
+        {
+          DEBUG ("no .manager file, but will activate CM soon anyway");
+        }
       /* else we're going to introspect soon anyway */
     }
 
-- 
1.5.6.5