summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.co.uk>2013-11-25 14:56:01 -0500
committerXavier Claessens <xavier.claessens@collabora.co.uk>2013-11-26 08:59:21 -0500
commit3c1c43cc2a13df3d5f56e20d49c7bd136486b372 (patch)
treefd313033e9d8629b54a7c03f9912b53a8576e150
parenta211090400176d2d433f69a2e38f9c1356a3abda (diff)
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.
-rw-r--r--telepathy-glib/run.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/telepathy-glib/run.c b/telepathy-glib/run.c
index 7ae6e8236..c3df19037 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;
}
}