changeset 5295fadc4308 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=5295fadc4308 description: fix getting vcard in rooms where JIDs are public

diffstat:

src/vcard.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (41 lines):

diff -r 7a86b478c0ff -r 5295fadc4308 src/vcard.py --- a/src/vcard.py Sat Mar 10 13:32:34 2012 +0100 +++ b/src/vcard.py Sun Mar 11 19:38:44 2012 +0100 @@ -242,7 +242,7 @@ return if obj.resource: # It's a muc occupant vcard - if obj.fjid != self.real_jid: + if obj.fjid != self.contact.jid: return else: if obj.jid != self.contact.jid: @@ -257,11 +257,15 @@ self.update_progressbar_timeout_id = None

def set_last_status_time(self, obj): + if obj.conn.name != self.account: + return if obj.fjid != self.real_jid: return self.fill_status_label()

def set_os_info(self, obj): + if obj.conn.name != self.account: + return if self.xml.get_object('information_notebook').get_n_pages() < 5: return if obj.fjid != self.real_jid: @@ -291,9 +295,11 @@ self.test_remove_progressbar()

def set_entity_time(self, obj): + if obj.conn.name != self.account: + return if self.xml.get_object('information_notebook').get_n_pages() < 5: return - if obj.fjid != self.real_jid: + if obj.fjid != self.contact.jid: return i = 0 time_s = ''