# HG changeset patch
# User Charly COSTE <changaco@changaco.net>
# Date 1253455852 -7200
# Node ID 69e4fc0f015cd83645ca434fbfe7abd0e85f73ed
# Parent  965dd6f5fcc3fe42d932de22cafdf65dfd4221ff
Tried to fix XMPP «Replaced by new connection» problem

Signed-off-by: Charly COSTE <changaco@changaco.net>

diff --git a/bot.py b/bot.py
--- a/bot.py
+++ b/bot.py
@@ -104,6 +104,11 @@ class bot(Thread):
 			except (xml.parsers.expat.ExpatError, xmpp.protocol.XMLNotWellFormed):
 				self.error('=> Debug: invalid stanza', debug=True)
 				unlock = True
+			except xmpp.Conflict:
+				c.reconnectAndReauth()
+				for m in c.mucs:
+					m.rejoin()
+				unlock = True
 			except:
 				error = '[Error] Unkonwn exception on XMPP thread:\n'
 				error += traceback.format_exc()