X-Git-Url: https://code.delx.au/pymsnt/blobdiff_plain/7f0a1cae2ca8d429f2f4ddf9b27ba9002b84665a..cdc1223ee42d056ecf7b7334aa921f6c1583b56e:/src/legacy/glue.py

diff --git a/src/legacy/glue.py b/src/legacy/glue.py
index c00be73..2655360 100644
--- a/src/legacy/glue.py
+++ b/src/legacy/glue.py
@@ -2,11 +2,11 @@
 # Licensed for distribution under the GPL version 2, check COPYING for details
 
 import os.path
-import utils
 from twisted.internet import task, error
-from tlib.xmlw import Element
-from tlib import msn
+from twisted.words.xish.domish import Element
+
 from debug import LogEvent, INFO, WARN, ERROR
+from legacy import msn
 import disco
 import groupchat
 import ft
@@ -18,7 +18,7 @@ import lang
 
 
 url = "http://msn-transport.jabberstudio.org"
-version = "0.11-dev"         # The transport version
+version = "0.11.2-dev"   # The transport version
 mangle = True            # XDB '@' -> '%' mangling
 id = "msn"               # The transport identifier
 
@@ -36,6 +36,7 @@ defaultAvatar = avatar.AvatarCache().setAvatar(defaultAvatarData)
 
 def reloadConfig():
 	msn.MSNConnection.GETALLAVATARS = config.getAllAvatars
+	msn.setDebug(config._debugLevel >= 4)
 
 def isGroupJID(jid):
 	""" Returns True if the JID passed is a valid groupchat JID (for MSN, does not contain '%') """
@@ -108,10 +109,10 @@ def msn2jid(msnid, withResource):
 	else:
 		if msnid.startswith("tel:+"):
 			msnid = msnid.replace("tel:+", "") + "%tel"
-		jid = msnid.replace('@', '%') + "@" + config.jid + (withResource and "/msn" or "")
+		jid = msnid.replace('@', '%') + "@" + config.jid
 		msn2jid_cache[msnid] = jid
 		jid2msn_cache[jid] = msnid
-		return jid
+		return msn2jid(msnid, withResource)
 
 # Marks this as the function to be used in jabber:iq:gateway (Service ID Translation)
 def translateAccount(msnid):
@@ -335,9 +336,9 @@ class LegacyConnection(msn.MSNConnection):
 		global defaultJabberAvatarData
 
 		if av:
-			msn.MSNConnection.changeAvatar(self, av.getImageData())
+			msn.MSNConnection.changeAvatar(self, av.getImageData)
 		else:
-			msn.MSNConnection.changeAvatar(self, defaultJabberAvatarData)
+			msn.MSNConnection.changeAvatar(self, lambda: defaultJabberAvatarData)
 	
 	def sendTypingNotifications(self):
 		if not self.session: return
@@ -404,13 +405,13 @@ class LegacyConnection(msn.MSNConnection):
 	
 	def loggedIn(self):
 		LogEvent(INFO, self.jabberID)
-		self.session.ready = True
 	
 	def listSynchronized(self):
 		LogEvent(INFO, self.jabberID)
 		self.session.sendPresence(to=self.jabberID, fro=config.jid)
 		self.legacyList.syncJabberLegacyLists()
 		self.listSynced = True
+		self.session.ready = True
 		#self.legacyList.flushSubscriptionBuffer()
 	
 	def ourStatusChanged(self, statusCode, screenName, personal):
@@ -551,10 +552,8 @@ class LegacyList:
 	def __init__(self, session):
 		self.jabberID = session.jabberID
 		self.session = session
-		self.subscriptionBuffer = []
 	
 	def removeMe(self):
-		self.subscriptionBuffer = None
 		self.session = None
 
 	def addContact(self, jid):