X-Git-Url: https://code.delx.au/pymsnt/blobdiff_plain/85e6c0f55bd0d46cad7f94d15b52c7b64dc94c08..cc447943af3bbac238973eda368ba9c22174d1f9:/src/groupchat.py

diff --git a/src/groupchat.py b/src/groupchat.py
index 27b4d0e..c190579 100644
--- 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