[Telepathy-commits] [telepathy-gabble/master] Remove the content timer when the content is accepted

[Sjoerd Simons]

---
 src/jingle-content.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/jingle-content.c b/src/jingle-content.c
index 4e5edb5..b04ad15 100644
--- a/src/jingle-content.c
+++ b/src/jingle-content.c
@@ -641,6 +641,10 @@ gabble_jingle_content_parse_accept (GabbleJingleContent *c,
   if (*error != NULL)
       return;
 
+  if (priv->timer_id != 0)
+      g_source_remove (priv->timer_id);
+  priv->timer_id = 0;
+
   priv->state = JINGLE_CONTENT_STATE_ACKNOWLEDGED;
   g_object_notify ((GObject *) c, "state");
 }
-- 
1.5.6.5