[Telepathy-commits] [telepathy-glib/master] tp_connection_manager_idle_read_manager_file: on success, don't try to force a D-Bus call

Simon McVittie simon.mcvittie at collabora.co.uk
Fri Feb 13 03:09:24 PST 2009


Because of checks in idle_introspect, the only effect was a
misleading debug message.
---
 telepathy-glib/connection-manager.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
index d9b187d..f076700 100644
--- a/telepathy-glib/connection-manager.c
+++ b/telepathy-glib/connection-manager.c
@@ -1137,6 +1137,7 @@ tp_connection_manager_idle_read_manager_file (gpointer data)
               g_signal_emit (self, signals[SIGNAL_GOT_INFO], 0,
                   self->info_source);
               tp_connection_manager_ready_or_failed (self, NULL);
+              goto out;
             }
         }
 
@@ -1153,6 +1154,7 @@ tp_connection_manager_idle_read_manager_file (gpointer data)
       /* else we're going to introspect soon anyway */
     }
 
+out:
   self->priv->manager_file_read_idle_id = 0;
 
   return FALSE;
-- 
1.5.6.5




More information about the telepathy-commits mailing list