chmod +x PyMSNt.py

[pymsnt] / src / session.py

diff --git a/src/session.py b/src/session.py
index df5557e08dc958aac871a82b91daf92395cfc489..c876fe7a3658721ec60287ba8128eb87fd7b0799 100644 (file)
--- a/src/session.py
+++ b/src/session.py
@@ -118,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:
@@ -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(e.__str__())
                        if not avatarSet:
                                self.legacycon.updateAvatar() # Default avatar