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

get_contact_iter now handles sub child. Fixes #1650

This commit is contained in:
Yann Leboulanger 2006-03-06 10:34:51 +00:00
parent 15a1451f7f
commit aa796665c5
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/roster_window.py
View File

@ -113,13 +113,29 @@ class RosterWindow:
if jid == model[contact_iter][C_JID].decode('utf-8') and \ if jid == model[contact_iter][C_JID].decode('utf-8') and \
account == model[contact_iter][C_ACCOUNT].decode('utf-8'): account == model[contact_iter][C_ACCOUNT].decode('utf-8'):
found.append(contact_iter) found.append(contact_iter)
sub_contact_iter = model.iter_children(contact_iter) # find next contact iter
while sub_contact_iter: if model.iter_has_child(contact_iter):
if jid == model[sub_contact_iter][C_JID].decode('utf-8') and \ # his first child if it has some
account == model[sub_contact_iter][C_ACCOUNT].decode('utf-8'): contact_iter = model.iter_children(contact_iter)
found.append(sub_contact_iter) else:
sub_contact_iter = model.iter_next(sub_contact_iter) next_contact_iter = model.iter_next(contact_iter)
contact_iter = model.iter_next(contact_iter) if not next_contact_iter:
# now we need to go up
parent_iter = model.iter_parent(contact_iter)
parent_type = model[parent_iter][C_TYPE]
while parent_type != 'group':
contact_iter = model.iter_next(parent_iter)
if contact_iter:
break
else:
parent_iter = model.iter_parent(parent_iter)
parent_type = model[parent_iter][C_TYPE]
else:
# we tested all contacts in this group
contact_iter = None
else:
# his brother if he has
contact_iter = next_contact_iter
group_iter = model.iter_next(group_iter) group_iter = model.iter_next(group_iter)
return found return found