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

diff --git a/src/legacy/glue.py b/src/legacy/glue.py
index 12b2df0..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.2-dev"       # The transport version
+version = "0.11.2-dev"   # The transport version
 mangle = True            # XDB '@' -> '%' mangling
 id = "msn"               # The transport identifier
 
@@ -336,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
@@ -405,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):