From 6ce4febf197b9b02d29157176db76e5f5e0c9a2c Mon Sep 17 00:00:00 2001
From: Goffi <goffi@goffi.org>
Date: Fri, 7 Oct 2011 12:09:48 +0200
Subject: [PATCH] plugins XEP-0047 and XEP-0065: timout bug fix

---
 src/plugins/plugin_xep_0047.py | 3 +++
 src/plugins/plugin_xep_0065.py | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/plugins/plugin_xep_0047.py b/src/plugins/plugin_xep_0047.py
index 50dfbe69..d019609e 100644
--- a/src/plugins/plugin_xep_0047.py
+++ b/src/plugins/plugin_xep_0047.py
@@ -296,6 +296,9 @@ class XEP_0047():
             self.terminateStream(sid, "IQ_ERROR")
             return
         
+        if data['timer'].active():
+            data['timer'].cancel()
+        
         buffer = data["file_obj"].read(data["block_size"])
         if buffer:
             next_iq_elt = client.IQ(data["xmlstream"],'set')
diff --git a/src/plugins/plugin_xep_0065.py b/src/plugins/plugin_xep_0065.py
index 6b6505a0..1882aff4 100755
--- a/src/plugins/plugin_xep_0065.py
+++ b/src/plugins/plugin_xep_0065.py
@@ -668,6 +668,7 @@ class XEP_0065():
             self.sendNotAcceptableError(iq_elt['id'], iq_elt['from'], xmlstream)
             return
 
+        self.current_stream[sid]['timer'].cancel()
         self.current_stream[sid]["to"] = jid.JID(iq_elt["to"])
         self.current_stream[sid]["xmlstream"] = xmlstream