copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix os info / client info / contact time in vcard of groupchat contacts

Browse source
This commit is contained in:
Yann Leboulanger 2009-06-04 22:46:05 +02:00
parent 0e11e16bc2
commit d844f7f632
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/vcard.py
View file

@ -90,12 +90,16 @@ class VcardWindow:
gc_contact.room_jid, account) gc_contact.room_jid, account)
if gc_contact.jid and not gc_control.is_anonymous: if gc_contact.jid and not gc_control.is_anonymous:
self.real_jid = gc_contact.jid self.real_jid = gc_contact.jid
self.real_jid_for_vcard = gc_contact.jid
if gc_contact.resource: if gc_contact.resource:
self.real_jid += '/' + gc_contact.resource self.real_jid += '/' + gc_contact.resource
else: else:
self.real_jid = gc_contact.get_full_jid() self.real_jid = gc_contact.get_full_jid()
self.real_jid_for_vcard = self.real_jid
self.real_resource = gc_contact.name
else: else:
self.real_jid = contact.get_full_jid() self.real_jid = contact.get_full_jid()
self.real_resource = contact.resource
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) + \
@ -395,10 +399,9 @@ class VcardWindow:
gobject.idle_add(gajim.connections[self.account].\ gobject.idle_add(gajim.connections[self.account].\
request_entity_time, self.contact.jid, self.contact.resource) request_entity_time, self.contact.jid, self.contact.resource)
self.os_info = {0: {'resource': self.real_resource, 'client': '',
self.os_info = {0: {'resource': self.contact.resource, 'client': '',
'os': ''}} 'os': ''}}
self.time_info = {0: {'resource': self.contact.resource, 'time': ''}} self.time_info = {0: {'resource': self.real_resource, 'time': ''}}
i = 1 i = 1
contact_list = gajim.contacts.get_contacts(self.account, self.contact.jid) contact_list = gajim.contacts.get_contacts(self.account, self.contact.jid)
if contact_list: if contact_list:
@ -430,11 +433,7 @@ class VcardWindow:
if self.gc_contact: if self.gc_contact:
# If we know the real jid, remove the resource from vcard request # If we know the real jid, remove the resource from vcard request
if self.gc_contact.jid: gajim.connections[self.account].request_vcard(self.real_jid_for_vcard,
jid = self.gc_contact.jid
else:
jid = self.real_jid
gajim.connections[self.account].request_vcard(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)