telepathy-salut: multicast-causal-transport: make sure to always reset keepalive_timer

[Guillaume Desmottes]

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

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

multicast-causal-transport: make sure to always reset keepalive_timer

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

---

 lib/gibber/gibber-r-multicast-causal-transport.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/gibber/gibber-r-multicast-causal-transport.c b/lib/gibber/gibber-r-multicast-causal-transport.c
index 1ec2f9f..f6952c5 100644
--- a/lib/gibber/gibber-r-multicast-causal-transport.c
+++ b/lib/gibber/gibber-r-multicast-causal-transport.c
@@ -286,6 +286,7 @@ gibber_r_multicast_causal_transport_dispose (GObject *object)
   if (priv->keepalive_timer != 0)
     {
       g_source_remove (priv->keepalive_timer);
+      priv->keepalive_timer = 0;
     }
 
   if (priv->self != NULL)
@@ -1223,6 +1224,7 @@ do_disconnect (GibberRMulticastCausalTransport *transport)
   if (priv->keepalive_timer != 0)
     {
       g_source_remove (priv->keepalive_timer);
+      priv->keepalive_timer = 0;
     }
 
   gibber_transport_set_state (GIBBER_TRANSPORT (self),