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

show correctly error message and log them in DB. fixes #1802

Browse source
This commit is contained in:
Yann Leboulanger 2006-04-10 14:00:04 +00:00
parent 87bb1c5551
commit eb8cc5b7ea
3 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/connection_handlers.py
View file

@ -1260,8 +1260,15 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco)
msgtxt = decmsg msgtxt = decmsg
encrypted = True encrypted = True
if mtype == 'error': if mtype == 'error':
self.dispatch('MSGERROR', (frm, msg.getErrorCode(), msg.getError(), error_msg = msg.getError()
msgtxt, tim)) if not error_msg:
error_msg = msgtxt
msgtxt = None
if self.name not in no_log_for:
gajim.logger.write('error', frm, error_msg, tim = tim,
subject = subject)
self.dispatch('MSGERROR', (frm, msg.getErrorCode(), error_msg, msgtxt,
tim))
elif mtype == 'groupchat': elif mtype == 'groupchat':
if subject: if subject:
self.dispatch('GC_SUBJECT', (frm, subject, msgtxt)) self.dispatch('GC_SUBJECT', (frm, subject, msgtxt))

7
src/common/logger.py
View file

@ -66,8 +66,9 @@ class Constants:
self.KIND_SINGLE_MSG_RECV, self.KIND_SINGLE_MSG_RECV,
self.KIND_CHAT_MSG_RECV, self.KIND_CHAT_MSG_RECV,
self.KIND_SINGLE_MSG_SENT, self.KIND_SINGLE_MSG_SENT,
self.KIND_CHAT_MSG_SENT self.KIND_CHAT_MSG_SENT,
) = range(7) self.KIND_ERROR
) = range(8)
( (
self.SHOW_ONLINE, self.SHOW_ONLINE,
@ -170,6 +171,8 @@ class Logger:
kind_col = constants.KIND_CHAT_MSG_RECV kind_col = constants.KIND_CHAT_MSG_RECV
elif kind == 'chat_msg_sent': elif kind == 'chat_msg_sent':
kind_col = constants.KIND_CHAT_MSG_SENT kind_col = constants.KIND_CHAT_MSG_SENT
elif kind == 'error':
kind_col = constants.KIND_ERROR
if show == 'online': if show == 'online':
show_col = constants.SHOW_ONLINE show_col = constants.SHOW_ONLINE

6
src/gajim.py
View file

@ -656,8 +656,10 @@ class Interface:
if gajim.jid_is_transport(jid): if gajim.jid_is_transport(jid):
jid = jid.replace('@', '') jid = jid.replace('@', '')
self.roster.on_message(jid, _('error while sending') + \ msg = array[2]
' \"%s\" ( %s )' % (array[3], array[2]), array[4], account, \ if array[3]:
msg = _('error while sending %s ( %s )') % (array[3], msg)
self.roster.on_message(jid, msg, array[4], account, \
msg_type='error') msg_type='error')
def handle_event_msgsent(self, account, array): def handle_event_msgsent(self, account, array):