From f673ac96f8ae6aed89d83a1055518b47f4989623 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sun, 11 Mar 2012 19:38:44 +0100
Subject: [PATCH] fix getting vcard in rooms where JIDs are public
---
src/vcard.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/vcard.py b/src/vcard.py
index d0222482cb..52f7867459 100644
--- a/src/vcard.py
+++ b/src/vcard.py
@@ -242,7 +242,7 @@ class VcardWindow:
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 @@ class VcardWindow:
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 @@ class VcardWindow:
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 = ''
--
GitLab