From: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>
Date: Sun, 16 Apr 2006 13:17:48 +0000 (+0000)
Subject: Groupchat timeout is configurable.
X-Git-Url: https://code.delx.au/pymsnt/commitdiff_plain/cc447943af3bbac238973eda368ba9c22174d1f9

Groupchat timeout is configurable.

git-svn-id: http://delx.cjb.net/svn/pymsnt/trunk@138 55fbd22a-6204-0410-b2f0-b6c764c7e90a

committer: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>
---

diff --git a/config-example.xml b/config-example.xml
index 36cb2d4..8776927 100644
--- a/config-example.xml
+++ b/config-example.xml
@@ -50,6 +50,8 @@ Do not include the jid of the transport -->
 <allowRegister/>
 <!-- Get all avatars. If this is set to true then avatars are grabbed for all your contacts immediately. If false then avatars are only grabbed when you're in a chat with a contact -->
 <getAllAvatars/>
+<!-- The amount of time a user has to join a groupchat they are invited to before the transport makes them leave the room. (MSN protocol requires autojoining of groupchats) -->
+<!-- <groupchatTimeout>120</groupchatTimeout> -->
 
 
 <!-- File transfer settings -->
diff --git a/src/config.py b/src/config.py
index ea27ccc..17301b2 100644
--- a/src/config.py
+++ b/src/config.py
@@ -19,6 +19,7 @@ sessionGreeting = ""
 registerMessage = ""
 allowRegister = False
 getAllAvatars = False
+groupchatTimeout = 180
 useXCP = False
 
 ftJabberPort = ""
diff --git a/src/groupchat.py b/src/groupchat.py
index db430d8..c190579 100644
--- a/src/groupchat.py
+++ b/src/groupchat.py
@@ -29,7 +29,7 @@ class BaseGroupchat:
 		self.messageBuffer = []
 		self.contacts = []
 		
-		self.checkTimer = reactor.callLater(60.0*2, self.checkUserJoined, None)
+		self.checkTimer = reactor.callLater(float(config.groupchatTimeout), self.checkUserJoined, None)
 		
 		LogEvent(INFO, self.roomJID())
 	
diff --git a/src/tlib/msn/msn.py b/src/tlib/msn/msn.py
index bcc9aaa..96aa587 100644
--- a/src/tlib/msn/msn.py
+++ b/src/tlib/msn/msn.py
@@ -154,7 +154,7 @@ STATUS_LUNCH   = 'LUN'
 
 PINGSPEED = 50.0
 
-DEBUGALL = True
+DEBUGALL = False
 LINEDEBUG = False
 MESSAGEDEBUG = False
 MSNP2PDEBUG = False