From 4d5790e8cb14db412df3477e8b866a3457eb262f Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Wed, 10 Jan 2007 12:51:15 +0000 Subject: [PATCH] restore correctly error messages. fixes #2880 --- src/chat_control.py | 2 ++ src/common/logger.py | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/chat_control.py b/src/chat_control.py index 87950a23f..84190b621 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -1655,6 +1655,8 @@ class ChatControl(ChatControlBase): constants.KIND_CHAT_MSG_RECV): kind = 'incoming' name = self.contact.get_shown_name() + elif row[1] == constants.KIND_ERROR: + kind = 'status' tim = time.localtime(float(row[0])) diff --git a/src/common/logger.py b/src/common/logger.py index 1e8b53647..5e91538ba 100644 --- a/src/common/logger.py +++ b/src/common/logger.py @@ -425,10 +425,11 @@ class Logger: # 3 - 8 (we avoid the last 2 lines but we still return 5 asked) self.cur.execute(''' SELECT time, kind, message FROM logs - WHERE (%s) AND kind IN (%d, %d, %d, %d) AND time > %d + WHERE (%s) AND kind IN (%d, %d, %d, %d, %d) AND time > %d ORDER BY time DESC LIMIT %d OFFSET %d - ''' % (where_sql, constants.KIND_SINGLE_MSG_RECV, constants.KIND_CHAT_MSG_RECV, - constants.KIND_SINGLE_MSG_SENT, constants.KIND_CHAT_MSG_SENT, + ''' % (where_sql, constants.KIND_SINGLE_MSG_RECV, + constants.KIND_CHAT_MSG_RECV, constants.KIND_SINGLE_MSG_SENT, + constants.KIND_CHAT_MSG_SENT, constants.KIND_ERROR, timed_out, restore_how_many_rows, pending_how_many) )