request vcard to real jid if we know it. see #3054. TODO: request last time and os information to real jid too

This commit is contained in:
Yann Leboulanger 2007-07-22 13:39:18 +00:00
parent 725ef29a85
commit 56afa7012f
1 changed files with 12 additions and 1 deletions

View File

@ -71,6 +71,17 @@ class VcardWindow:
self.account = account self.account = account
self.gc_contact = gc_contact self.gc_contact = gc_contact
# Get real jid
if gc_contact:
if gc_contact.jid:
self.real_jid = gc_contact.jid
if gc_contact.resource:
self.real_jid += '/' + gc_contact.resource
else:
self.real_jid = gc_contact.get_full_jid()
else:
self.real_jid = contact.get_full_jid()
puny_jid = helpers.sanitize_filename(contact.jid) puny_jid = helpers.sanitize_filename(contact.jid)
local_avatar_basepath = os.path.join(gajim.AVATAR_PATH, puny_jid) + \ local_avatar_basepath = os.path.join(gajim.AVATAR_PATH, puny_jid) + \
'_local' '_local'
@ -357,7 +368,7 @@ class VcardWindow:
self.fill_status_label() self.fill_status_label()
if self.gc_contact: if self.gc_contact:
gajim.connections[self.account].request_vcard(self.contact.jid, gajim.connections[self.account].request_vcard(self.real_jid,
self.gc_contact.get_full_jid()) self.gc_contact.get_full_jid())
else: else:
gajim.connections[self.account].request_vcard(self.contact.jid) gajim.connections[self.account].request_vcard(self.contact.jid)