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

fix bug while sorting iters when merge is True

This commit is contained in:
Yann Leboulanger 2005-10-11 16:02:57 +00:00
parent d8e4c0b0e1
commit f03cae3e0e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/roster_window.py
View File

@ -2162,13 +2162,15 @@ _('If "%s" accepts this request you will know his status.') %jid)
return -1 return -1
if type1 == 'contact' and type2 == 'contact' and \ if type1 == 'contact' and type2 == 'contact' and \
gajim.config.get('sort_by_show'): gajim.config.get('sort_by_show'):
account = model.get_value(iter1, 4) account1 = model.get_value(iter1, 4)
if account and model.get_value(iter2, 4) == account: account2 = model.get_value(iter2, 4)
account = account.decode('utf-8') if account1 and account2:
account1 = account1.decode('utf-8')
account2 = account2.decode('utf-8')
jid1 = model[iter1][C_JID].decode('utf-8') jid1 = model[iter1][C_JID].decode('utf-8')
jid2 = model[iter2][C_JID].decode('utf-8') jid2 = model[iter2][C_JID].decode('utf-8')
luser1 = gajim.contacts[account][jid1] luser1 = gajim.contacts[account1][jid1]
luser2 = gajim.contacts[account][jid2] luser2 = gajim.contacts[account2][jid2]
cshow = {'online':0, 'chat': 1, 'away': 2, 'xa': 3, 'dnd': 4, cshow = {'online':0, 'chat': 1, 'away': 2, 'xa': 3, 'dnd': 4,
'invisible': 5, 'offline': 6, 'not in the roster': 7, 'error': 8} 'invisible': 5, 'offline': 6, 'not in the roster': 7, 'error': 8}
s = self.get_show(luser1) s = self.get_show(luser1)