From f5fca6dfa336cbd58648355478b99283b91f5c8f Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Sun, 20 Nov 2005 12:04:21 +0000 Subject: [PATCH] fix bug in get_contact_iter when we use merge mode --- src/roster_window.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/roster_window.py b/src/roster_window.py index eb2def908..1029ba8a9 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -98,7 +98,8 @@ class RosterWindow: while group_iter: user_iter = model.iter_children(group_iter) while user_iter: - if jid == model[user_iter][C_JID].decode('utf-8'): + if jid == model[user_iter][C_JID].decode('utf-8') and \ + account == model[user_iter][C_ACCOUNT].decode('utf-8'): found.append(user_iter) user_iter = model.iter_next(user_iter) group_iter = model.iter_next(group_iter)