fix getting vcard in rooms where JIDs are public

This commit is contained in:
Yann Leboulanger 2012-03-11 19:38:44 +01:00
parent 3ae3a151a4
commit f673ac96f8
1 changed files with 8 additions and 2 deletions

View File

@ -242,7 +242,7 @@ class VcardWindow:
return return
if obj.resource: if obj.resource:
# It's a muc occupant vcard # It's a muc occupant vcard
if obj.fjid != self.real_jid: if obj.fjid != self.contact.jid:
return return
else: else:
if obj.jid != self.contact.jid: if obj.jid != self.contact.jid:
@ -257,11 +257,15 @@ class VcardWindow:
self.update_progressbar_timeout_id = None self.update_progressbar_timeout_id = None
def set_last_status_time(self, obj): def set_last_status_time(self, obj):
if obj.conn.name != self.account:
return
if obj.fjid != self.real_jid: if obj.fjid != self.real_jid:
return return
self.fill_status_label() self.fill_status_label()
def set_os_info(self, obj): def set_os_info(self, obj):
if obj.conn.name != self.account:
return
if self.xml.get_object('information_notebook').get_n_pages() < 5: if self.xml.get_object('information_notebook').get_n_pages() < 5:
return return
if obj.fjid != self.real_jid: if obj.fjid != self.real_jid:
@ -291,9 +295,11 @@ class VcardWindow:
self.test_remove_progressbar() self.test_remove_progressbar()
def set_entity_time(self, obj): def set_entity_time(self, obj):
if obj.conn.name != self.account:
return
if self.xml.get_object('information_notebook').get_n_pages() < 5: if self.xml.get_object('information_notebook').get_n_pages() < 5:
return return
if obj.fjid != self.real_jid: if obj.fjid != self.contact.jid:
return return
i = 0 i = 0
time_s = '' time_s = ''