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

no need of the jid parameter when we look for self contact iter

This commit is contained in:
Yann Leboulanger 2009-11-07 09:34:23 +01:00
parent 4bf3be4665
commit e7a6dffe7b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/roster_window.py
View File

@ -134,11 +134,10 @@ class RosterWindow:
return group_iter return group_iter
def _get_self_contact_iter(self, jid, account, model=None): def _get_self_contact_iter(self, account, model=None):
''' Return the gtk.TreeIter of SelfContact or None if not found. ''' Return the gtk.TreeIter of SelfContact or None if not found.
Keyword arguments: Keyword arguments:
jid -- the jid of SelfContact
account -- the account of SelfContact account -- the account of SelfContact
model -- the data model (default TreeFilterModel) model -- the data model (default TreeFilterModel)
@ -153,8 +152,8 @@ class RosterWindow:
while iterC: while iterC:
if model[iterC][C_TYPE] != 'self_contact': if model[iterC][C_TYPE] != 'self_contact':
break break
iter_jid = model[iterC][C_JID] iter_account = model[iterC][C_ACCOUNT]
if iter_jid and jid == iter_jid.decode('utf-8'): if account == iter_account.decode('utf-8'):
return iterC return iterC
iterC = model.iter_next(iterC) iterC = model.iter_next(iterC)
return None return None
@ -177,7 +176,7 @@ class RosterWindow:
return [] return []
if jid == gajim.get_jid_from_account(account): if jid == gajim.get_jid_from_account(account):
contact_iter = self._get_self_contact_iter(jid, account, model) contact_iter = self._get_self_contact_iter(account, model)
if contact_iter: if contact_iter:
return [contact_iter] return [contact_iter]
else: else: