telepathy-idle: Returning FALSE from the timer function causes the timeout to be destroyed

[GitLab Mirror]

Module: telepathy-idle
Branch: master
Commit: acf5fcf4d830ae0b5953d8ded8eba4c17726c6f3
URL:    http://cgit.freedesktop.org/telepathy/telepathy-idle/commit/?id=acf5fcf4d830ae0b5953d8ded8eba4c17726c6f3

Author: Diane Trout <diane at ghic.org>
Date:   Mon Nov  6 21:46:00 2017 -0800

Returning FALSE from the timer function causes the timeout to be destroyed

I asked one of the polari devs and was told that yes it is ok to set
the timer id to zero in the timer function.

With this patch make check works without changing any of the expected
test results and without any coredumps

---

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

diff --git a/src/idle-connection.c b/src/idle-connection.c
index 6ab5fea..71c020f 100644
--- a/src/idle-connection.c
+++ b/src/idle-connection.c
@@ -600,6 +600,7 @@ _force_disconnect (gpointer data)
 
 	IDLE_DEBUG("gave up waiting, forcibly disconnecting");
 	idle_server_connection_force_disconnect(priv->conn);
+	priv->force_disconnect_id = 0;
 	return FALSE;
 }