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:
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":
self.legacycon.updateAvatar(self.avatar)
avatarSet = True
if name:
- self.updateNickname(e.__str__())
+ self.updateNickname(name)
if not avatarSet:
self.legacycon.updateAvatar() # Default avatar
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)