changeset 715d6986b745 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=715d6986b745 description: fix os info / client info / contact time in vcard of groupchat contacts diffstat:
src/vcard.py | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-)
diffs (46 lines):
diff -r 64b3a5961415 -r 715d6986b745 src/vcard.py --- a/src/vcard.py Thu Jun 04 21:45:46 2009 +0200 +++ b/src/vcard.py Thu Jun 04 22:46:05 2009 +0200 @@ -90,12 +90,16 @@ gc_contact.room_jid, account) if gc_contact.jid and not gc_control.is_anonymous: self.real_jid = gc_contact.jid + self.real_jid_for_vcard = gc_contact.jid if gc_contact.resource: self.real_jid += '/' + gc_contact.resource else: self.real_jid = gc_contact.get_full_jid() + self.real_jid_for_vcard = self.real_jid + self.real_resource = gc_contact.name else: self.real_jid = contact.get_full_jid() + self.real_resource = contact.resource
puny_jid = helpers.sanitize_filename(contact.jid) local_avatar_basepath = os.path.join(gajim.AVATAR_PATH, puny_jid) + \ @@ -395,10 +399,9 @@ gobject.idle_add(gajim.connections[self.account].\ request_entity_time, self.contact.jid, self.contact.resource)
- - self.os_info = {0: {'resource': self.contact.resource, 'client': '', + self.os_info = {0: {'resource': self.real_resource, 'client': '', 'os': ''}} - self.time_info = {0: {'resource': self.contact.resource, 'time': ''}} + self.time_info = {0: {'resource': self.real_resource, 'time': ''}} i = 1 contact_list = gajim.contacts.get_contacts(self.account, self.contact.jid) if contact_list: @@ -430,11 +433,7 @@
if self.gc_contact: # If we know the real jid, remove the resource from vcard request - if self.gc_contact.jid: - jid = self.gc_contact.jid - else: - jid = self.real_jid - gajim.connections[self.account].request_vcard(jid, + gajim.connections[self.account].request_vcard(self.real_jid_for_vcard, self.gc_contact.get_full_jid()) else: gajim.connections[self.account].request_vcard(self.contact.jid)