[telepathy-glib-0.20] telepathy-glib: TpBaseConnectionManager: Fix critical printed each time a new connection is made

[Xavier Claessens]

Module: telepathy-glib
Branch: telepathy-glib-0.20
Commit: 3c1c43cc2a13df3d5f56e20d49c7bd136486b372
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=3c1c43cc2a13df3d5f56e20d49c7bd136486b372

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Mon Nov 25 14:56:01 2013 -0500

TpBaseConnectionManager: Fix critical printed each time a new connection is made

glib 2.39.0 started to print a g_critical() message when calling
g_source_remove() on a source that does not exist anymore.

---

 telepathy-glib/run.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/telepathy-glib/run.c b/telepathy-glib/run.c
index 7ae6e82..c3df190 100644
--- a/telepathy-glib/run.c
+++ b/telepathy-glib/run.c
@@ -84,7 +84,7 @@ kill_connection_manager (gpointer data)
     }
 
   timeout_id = 0;
-  return FALSE;
+  return G_SOURCE_REMOVE;
 }
 
 static void
@@ -98,6 +98,7 @@ new_connection (TpBaseConnectionManager *conn,
   if (0 != timeout_id)
     {
       g_source_remove (timeout_id);
+      timeout_id = 0;
     }
 }