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

prevent loop when adding metacontact to roster 

(fixes #1953 and maybe #1991)
This commit is contained in:
Dimitur Kirov 2006-05-24 18:17:51 +00:00
parent d440bdddab
commit 6953685979
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/roster_window.py
View File

@ -239,11 +239,17 @@ class RosterWindow:
# 'priority' is optional # 'priority' is optional
family = gajim.contacts.get_metacontacts_family(account, jid) family = gajim.contacts.get_metacontacts_family(account, jid)
shown_family = [] # family members that are in roster. # family members that are in roster and belong to the same account.
shown_family = []
if family: if family:
for data in family: for data in family:
_jid = data['jid']
_account = data['account'] _account = data['account']
#XXX When we support metacontacts from different servers, make
# sure that loop from #1953 is fixed and remove next 2 lines!
if _account != account:
continue
_jid = data['jid']
if self.get_contact_iter(_jid, _account): if self.get_contact_iter(_jid, _account):
shown_family.append(data) shown_family.append(data)
if _jid == jid: if _jid == jid:
@ -2250,7 +2256,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
dialogs.SingleMessageWindow(account, action = 'send') dialogs.SingleMessageWindow(account, action = 'send')
def on_new_chat_menuitem_activate(self, widget, account): def on_new_chat_menuitem_activate(self, widget, account):
dialogs.NewChatDialog(account) dialogs.NewChatDialog(account)
def on_contents_menuitem_activate(self, widget): def on_contents_menuitem_activate(self, widget):
helpers.launch_browser_mailer('url', 'http://trac.gajim.org/wiki') helpers.launch_browser_mailer('url', 'http://trac.gajim.org/wiki')