[telepathy-idle-0.2] telepathy-idle: idle-connection: make sure to always reset force_disconnect_id

[GitLab Mirror]

Module: telepathy-idle
Branch: telepathy-idle-0.2
Commit: 5e5b677173ef64055b4a7073cb5a15066fc03f70
URL:    http://cgit.freedesktop.org/telepathy/telepathy-idle/commit/?id=5e5b677173ef64055b4a7073cb5a15066fc03f70

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Fri Feb 14 12:12:54 2014 +0100

idle-connection: make sure to always reset force_disconnect_id

Recent GLib raises a critical when trying to remove an invalid source.

(cherry picked from commit 12211654baa75db13a05b5c2b3293d1378fcf7a2)

---

 src/idle-connection.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/idle-connection.c b/src/idle-connection.c
index 71c020f..8614d52 100644
--- a/src/idle-connection.c
+++ b/src/idle-connection.c
@@ -585,6 +585,7 @@ static gboolean _finish_shutdown_idle_func(gpointer data) {
 	IdleConnectionPrivate *priv = self->priv;
 	if (priv->force_disconnect_id != 0) {
 		g_source_remove(priv->force_disconnect_id);
+		priv->force_disconnect_id = 0;
 	}
 
 	tp_base_connection_finish_shutdown(conn);