Fixed nickname sending.

[pymsnt] / src / session.py

diff --git a/src/session.py b/src/session.py
index 847309dfee628f49b5940d3559b073210a8b3f09..19dfd305e72ce2af3adaea79ea2a7c7aaa0db212 100644 (file)
--- a/src/session.py
+++ b/src/session.py
@@ -120,9 +120,9 @@ class Session(jabw.JabberConnection):
                        avatarSet = False
                        name = ""
                        for e in vCard.elements():
-                               if e.name == "NICKNAME":
+                               if e.name == "NICKNAME" and e.__str__():
                                        name = e.__str__()
-                               if not name and e.name == "FN":
+                               if not name and e.name == "FN" and e.__str__():
                                        # Give priority to nickname
                                        name = e.__str__()
                                if e.name == "PHOTO":
@@ -133,7 +133,7 @@ class Session(jabw.JabberConnection):
                                        self.legacycon.updateAvatar(self.avatar)
                                        avatarSet = True
                        if name:
-                               self.updateNickname(e.__str__())
+                               self.updateNickname(name)
                        if not avatarSet:
                                self.legacycon.updateAvatar() # Default avatar