diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-02-14 13:54:02 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-02-14 13:54:02 +0100 |
| commit | a15e79348eefcb324c9c7135d642ca1ed0b2c573 (patch) | |
| tree | 164ccfaf7e38451bafa3eb8cdd4fc57913ddf2eb | |
| parent | a62b193e638686733a1e279e7c7f944ad091bc3a (diff) | |
| parent | 12211654baa75db13a05b5c2b3293d1378fcf7a2 (diff) | |
| download | telepathy-idle-a15e79348eefcb324c9c7135d642ca1ed0b2c573.tar.gz | |
Merge branch 'master' into next-merge
| -rw-r--r-- | src/idle-connection.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/idle-connection.c b/src/idle-connection.c index 9c02ade..ee0d73a 100644 --- a/src/idle-connection.c +++ b/src/idle-connection.c @@ -572,6 +572,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); @@ -587,6 +588,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; } |