Groupchat timeout is configurable.

[pymsnt] / src / groupchat.py

diff --git a/src/groupchat.py b/src/groupchat.py
index 27b4d0ef1ce29afaaf09f2fdae2d2ea1567c6e0f..c190579de07ed96c7827437b8f40571980de6090 100644 (file)
--- a/src/groupchat.py
+++ b/src/groupchat.py
@@ -3,10 +3,7 @@
 
 import utils
 from twisted.internet import reactor
-if(utils.checkTwisted()):
-       from twisted.xish.domish import Element
-else:
-       from tlib.domish import Element
+from tlib.xmlw import Element
 from debug import LogEvent, INFO, WARN, ERROR
 import disco
 import jabw
@@ -32,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())
        
@@ -50,8 +47,6 @@ class BaseGroupchat:
 
                LogEvent(INFO, self.roomJID())
 
-               utils.mutilateMe(self)
-       
        def roomJID(self):
                """ Returns the room JID """
                return self.ID + "@" + config.jid