Fixed groupchatTimeout

[pymsnt] / src / session.py

diff --git a/src/session.py b/src/session.py
index 57e7ff449640e23c008e2eed613afcd246ec8623..19dfd305e72ce2af3adaea79ea2a7c7aaa0db212 100644 (file)
--- a/src/session.py
+++ b/src/session.py
@@ -111,16 +111,20 @@ class Session(jabw.JabberConnection):
                        LogEvent(INFO, self.jabberID)
                        vCard = None
                        for e in el.elements():
-                               if e.name == "vCard" and e.defaultUri == disco.VCARDTEMP:
+                               if e.name == "vCard" and e.uri == disco.VCARDTEMP:
                                        vCard = e
                                        break
                        else:
                                self.legacycon.updateAvatar() # Default avatar
                                return
                        avatarSet = False
+                       name = ""
                        for e in vCard.elements():
-                               if e.name == "NICKNAME":
-                                       self.updateNickname(e.__str__())
+                               if e.name == "NICKNAME" and e.__str__():
+                                       name = e.__str__()
+                               if not name and e.name == "FN" and e.__str__():
+                                       # Give priority to nickname
+                                       name = e.__str__()
                                if e.name == "PHOTO":
                                        imageData = avatar.parsePhotoEl(e)
                                        if not imageData:
@@ -128,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(name)
                        if not avatarSet:
                                self.legacycon.updateAvatar() # Default avatar
 
@@ -137,7 +143,7 @@ class Session(jabw.JabberConnection):
                                self.legacycon.updateAvatar()
 
                LogEvent(INFO, self.jabberID, "Fetching avatar.")
-               d = self.sendVCardRequest(to=self.jabberID, fro=config.jid)
+               d = self.sendVCardRequest(to=self.jabberID, fro=config.jid + "/msn")
                d.addCallback(vCardReceived)
                d.addErrback(errback)
        
@@ -180,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, self.pytrans.avatarCache) # 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()
@@ -266,7 +272,10 @@ class Session(jabw.JabberConnection):
                
                elif ptype == "probe":
                        LogEvent(INFO, self.jabberID, "Responding to presence probe")
-                       self.contactList.getContact(toj.userhost()).sendPresence(fro)
+                       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)