summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiane Trout <diane@ghic.org>2017-11-06 21:46:00 -0800
committerDiane Trout <diane@ghic.org>2017-11-06 21:46:00 -0800
commitacf5fcf4d830ae0b5953d8ded8eba4c17726c6f3 (patch)
treeaddf9091a70a528847664cd9625162bfc4397f69
parent0ce3a8fa2bd3f4e72358bb53ecd0acf8fe448483 (diff)
downloadtelepathy-idle-acf5fcf4d830ae0b5953d8ded8eba4c17726c6f3.tar.gz
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
-rw-r--r--src/idle-connection.c1
1 files changed, 1 insertions, 0 deletions
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;
}