diff options
| author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-11-26 09:00:43 -0500 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-11-26 09:00:43 -0500 |
| commit | 1b28e0ca43acec40f708d480e2824743561c5b97 (patch) | |
| tree | efa57af869d62066c85572e8e07f80ecba060dd2 | |
| parent | d4388c7c1fedb1e91b99075cd6b15b5cf573a302 (diff) | |
| parent | 3c1c43cc2a13df3d5f56e20d49c7bd136486b372 (diff) | |
Merge branch 'telepathy-glib-0.20' into telepathy-glib-0.22
| -rw-r--r-- | 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 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; } } |