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:
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
elif ptype == "probe":
LogEvent(INFO, self.jabberID, "Responding to presence probe")
- self.contactList.getContact(to).sendPresence(source)
+ 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)