From eda8ec8436aa60724c57c6ff48771c3de15b019c Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Thu, 8 Dec 2005 22:39:01 +0000
Subject: [PATCH] fix a TB: we can have a row without an account during a short
time ... I don't know why
---
src/roster_window.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/roster_window.py b/src/roster_window.py
index 420ae60dbb..923f4e7d4e 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -2366,7 +2366,9 @@ def compareIters(self, model, iter1, iter2, data = None):
jid2 = model[iter2][C_JID].decode('utf-8')
# We first compare by show if sort_by_show is True
if type1 == 'contact' and type2 == 'contact' and \
- gajim.config.get('sort_by_show'):
+ gajim.config.get('sort_by_show'):
+ if account1 and account2: # We an have contact without account
+ # during a short time ... why?
luser1 = gajim.contacts[account1][jid1]
luser2 = gajim.contacts[account2][jid2]
cshow = {'online':0, 'chat': 1, 'away': 2, 'xa': 3, 'dnd': 4,
@@ -2390,7 +2392,7 @@ def compareIters(self, model, iter1, iter2, data = None):
return -1
if name2.lower() < name1.lower():
return 1
- if type1 == 'contact' and type2 == 'contact':
+ if type1 == 'contact' and type2 == 'contact' and account1 and account2:
# We compare account names
if account1.lower() < account2.lower():
return -1
--
GitLab