# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1317982188 -7200
# Node ID c513328ade9df9904a1e684d7f4e8378b26dc366
# Parent  f03688bdb85863c20c34686669695af51edc4d68
plugins XEP-0047 and XEP-0065: timout bug fix

diff -r f03688bdb858 -r c513328ade9d src/plugins/plugin_xep_0047.py
--- a/src/plugins/plugin_xep_0047.py	Fri Oct 07 11:19:15 2011 +0200
+++ b/src/plugins/plugin_xep_0047.py	Fri Oct 07 12:09:48 2011 +0200
@@ -296,6 +296,9 @@
             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 -r f03688bdb858 -r c513328ade9d src/plugins/plugin_xep_0065.py
--- a/src/plugins/plugin_xep_0065.py	Fri Oct 07 11:19:15 2011 +0200
+++ b/src/plugins/plugin_xep_0065.py	Fri Oct 07 12:09:48 2011 +0200
@@ -668,6 +668,7 @@
             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