# Copyright 2004-2005 James Bunton <james@delx.cjb.net>
# Licensed for distribution under the GPL version 2, check COPYING for details
+from tlib.xmlw import jid
+
import utils
import legacy
import jabw
def updateNickname(self, nickname):
self.nickname = nickname
if not self.nickname:
- j = utils.jid(self.jabberID)
+ j = jid.intern(self.jabberID)
self.nickname = j.user
self.setStatus(self.show, self.status)
if avatarHash == " ": # Setting no avatar
self.legacycon.updateAvatar() # Default
elif (not self.avatar) or (self.avatar and self.avatar.getImageHash() != avatarHash):
- imageData = self.pytrans.avatarCache.getAvatar(avatarHash)
- if imageData:
- self.avatar = avatar.Avatar(imageData, self.pytrans.avatarCache) # Stuff in the cache is always PNG
+ av = self.pytrans.avatarCache.getAvatar(avatarHash)
+ if av:
+ self.avatar = av # Stuff in the cache is always PNG
self.legacycon.updateAvatar(self.avatar)
else:
self.doVCardUpdate()
groupchat = legacy.LegacyGroupchat(self, resource, gcID) # Creates an empty groupchat
groupchat.userJoined(tor)
+ elif ptype == "probe":
+ LogEvent(INFO, self.jabberID, "Responding to presence probe")
+ 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)