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 36cb2d4e1b826bd78c1ccb536dac2343f07bfcba..8776927c2c90c2161ed8a326930083addb2cc033 100644 (file)
--- 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/>
 <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 -->
 
 
 <!-- File transfer settings -->

diff --git a/src/config.py b/src/config.py
index ea27cccb87fa69c992b2213c8fb980a78f9bc88c..17301b2c372a125d7b37ce432acf2aa8f06dc543 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -19,6 +19,7 @@ sessionGreeting = ""
 registerMessage = ""
 allowRegister = False
 getAllAvatars = False
 registerMessage = ""
 allowRegister = False
 getAllAvatars = False

+groupchatTimeout = 180

 useXCP = False
 
 ftJabberPort = ""
 useXCP = False
 
 ftJabberPort = ""

diff --git a/src/groupchat.py b/src/groupchat.py
index db430d8602b2e8f49e4911d681a1131377ccc57b..c190579de07ed96c7827437b8f40571980de6090 100644 (file)
--- a/src/groupchat.py
+++ b/src/groupchat.py
@@ -29,7 +29,7 @@ class BaseGroupchat:
                self.messageBuffer = []
                self.contacts = []
                
                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())
        
                
                LogEvent(INFO, self.roomJID())
        

diff --git a/src/tlib/msn/msn.py b/src/tlib/msn/msn.py
index bcc9aaa04773475e77b0d9a94b65c23d6719f33e..96aa587556950bd6759631827f4eac1ba9a6a1e4 100644 (file)
--- a/src/tlib/msn/msn.py
+++ b/src/tlib/msn/msn.py
@@ -154,7 +154,7 @@ STATUS_LUNCH   = 'LUN'
 
 PINGSPEED = 50.0
 
 
 PINGSPEED = 50.0
 

-DEBUGALL = True
+DEBUGALL = False

 LINEDEBUG = False
 MESSAGEDEBUG = False
 MSNP2PDEBUG = False
 LINEDEBUG = False
 MESSAGEDEBUG = False
 MSNP2PDEBUG = False