chmod +x PyMSNt.py

[pymsnt] / src / session.py

diff --git a/src/session.py b/src/session.py
index c1f2f370e5961baec0f329c049881ba071a09a3f..c876fe7a3658721ec60287ba8128eb87fd7b0799 100644 (file)
--- a/src/session.py
+++ b/src/session.py
@@ -1,6 +1,8 @@
 # Copyright 2004-2005 James Bunton <james@delx.cjb.net>
 # Licensed for distribution under the GPL version 2, check COPYING for details
 
+from tlib.xmlw import jid
+
 import utils
 import legacy
 import jabw
@@ -10,10 +12,6 @@ import config
 import lang
 import disco
 from debug import LogEvent, INFO, WARN, ERROR
-if utils.checkTwisted():
-       from twisted.words.protocols.jabber import jid
-else:
-       from tlib.jabber import jid
 
 
 
@@ -106,7 +104,6 @@ class Session(jabw.JabberConnection):
                        self.pytrans = None
                
                LogEvent(INFO, self.jabberID, "Removed!")
-               utils.mutilateMe(self)
        
        def doVCardUpdate(self):
                def vCardReceived(el):
@@ -121,9 +118,13 @@ class Session(jabw.JabberConnection):
                                self.legacycon.updateAvatar() # Default avatar
                                return
                        avatarSet = False
+                       name = ""
                        for e in vCard.elements():
                                if e.name == "NICKNAME":
-                                       self.updateNickname(e.__str__())
+                                       name = e.__str__()
+                               if not name and e.name == "FN":
+                                       # Give priority to nickname
+                                       name = e.__str__()
                                if e.name == "PHOTO":
                                        imageData = avatar.parsePhotoEl(e)
                                        if not imageData:
@@ -131,6 +132,8 @@ class Session(jabw.JabberConnection):
                                        self.avatar = self.pytrans.avatarCache.setAvatar(imageData)
                                        self.legacycon.updateAvatar(self.avatar)
                                        avatarSet = True
+                       if name:
+                               self.updateNickname(e.__str__())
                        if not avatarSet:
                                self.legacycon.updateAvatar() # Default avatar
 
@@ -147,7 +150,7 @@ class Session(jabw.JabberConnection):
        def updateNickname(self, nickname):
                self.nickname = nickname
                if not self.nickname:
-                       j = jid.JID(self.jabberID)
+                       j = jid.intern(self.jabberID)
                        self.nickname = j.user
                self.setStatus(self.show, self.status)
        
@@ -183,9 +186,9 @@ class Session(jabw.JabberConnection):
                if avatarHash == " ": # Setting no avatar
                        self.legacycon.updateAvatar() # Default
                elif (not self.avatar) or (self.avatar and self.avatar.getImageHash() != avatarHash):
-                       imageData = self.pytrans.avatarCache.getAvatar(avatarHash)
-                       if imageData:
-                               self.avatar = avatar.Avatar(imageData) # Stuff in the cache is always PNG
+                       av = self.pytrans.avatarCache.getAvatar(avatarHash)
+                       if av:
+                               self.avatar = av # Stuff in the cache is always PNG
                                self.legacycon.updateAvatar(self.avatar)
                        else:
                                self.doVCardUpdate()
@@ -267,6 +270,12 @@ class Session(jabw.JabberConnection):
                        groupchat = legacy.LegacyGroupchat(self, resource, gcID) # Creates an empty groupchat
                        groupchat.userJoined(tor)
                
+               elif ptype == "probe":
+                       LogEvent(INFO, self.jabberID, "Responding to presence probe")
+                       if to == config.jid:
+                               self.legacycon.sendShowStatus(source)
+                       else:
+                               self.contactList.getContact(to).sendPresence(source)
                else:
                        # Not for groupchat
                        self.handleResourcePresence(source, resource, to, tor, priority, ptype, show, status)