From: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>
Date: Sat, 29 Apr 2006 13:52:43 +0000 (+0000)
Subject: Fixed nickname sending.
X-Git-Url: https://code.delx.au/pymsnt/commitdiff_plain/47b9fdf9c908f143315e526f7c2f164adceeb2be

Fixed nickname sending.

git-svn-id: http://delx.cjb.net/svn/pymsnt/trunk@147 55fbd22a-6204-0410-b2f0-b6c764c7e90a

committer: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>
---

diff --git a/src/session.py b/src/session.py
index 847309d..19dfd30 100644
--- 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