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

make sure that when we log, msg is not None

This commit is contained in:
Nikos Kouremenos 2006-04-09 19:46:11 +00:00
parent d3013cc367
commit 47a8ddccd5
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/connection_handlers.py
View File

@ -1274,19 +1274,21 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco)
self.dispatch('GC_MSG', (frm, msgtxt, tim)) self.dispatch('GC_MSG', (frm, msgtxt, tim))
if self.name not in no_log_for and jid in self.last_history_line \ if self.name not in no_log_for and jid in self.last_history_line \
and not int(float(time.mktime(tim))) <= \ and not int(float(time.mktime(tim))) <= \
self.last_history_line[jid]: self.last_history_line[jid] and msgtxt:
gajim.logger.write('gc_msg', frm, msgtxt, tim = tim) gajim.logger.write('gc_msg', frm, msgtxt, tim = tim)
elif mtype == 'chat': # it's type 'chat' elif mtype == 'chat': # it's type 'chat'
if not msg.getTag('body') and chatstate is None: #no <body> if not msg.getTag('body') and chatstate is None: #no <body>
return return
if msg.getTag('body') and self.name not in no_log_for and jid not in\ if msg.getTag('body') and self.name not in no_log_for and jid not in\
no_log_for: no_log_for and msgtxt:
gajim.logger.write('chat_msg_recv', frm, msgtxt, tim = tim, subject = subject) gajim.logger.write('chat_msg_recv', frm, msgtxt, tim = tim,
subject = subject)
self.dispatch('MSG', (frm, msgtxt, tim, encrypted, mtype, subject, self.dispatch('MSG', (frm, msgtxt, tim, encrypted, mtype, subject,
chatstate, msg_id, composing_jep)) chatstate, msg_id, composing_jep))
else: # it's single message else: # it's single message
if self.name not in no_log_for and jid not in no_log_for: if self.name not in no_log_for and jid not in no_log_for and msgtxt:
gajim.logger.write('single_msg_recv', frm, msgtxt, tim = tim, subject = subject) gajim.logger.write('single_msg_recv', frm, msgtxt, tim = tim,
subject = subject)
if invite is not None: if invite is not None:
item = invite.getTag('invite') item = invite.getTag('invite')
jid_from = item.getAttr('from') jid_from = item.getAttr('from')

3
src/common/logger.py
View File

@ -200,7 +200,8 @@ class Logger:
except sqlite.OperationalError, e: except sqlite.OperationalError, e:
print >> sys.stderr, str(e) print >> sys.stderr, str(e)
def write(self, kind, jid, message = None, show = None, tim = None, subject = None): def write(self, kind, jid, message = None, show = None, tim = None,
subject = None):
'''write a row (status, gcstatus, message etc) to logs database '''write a row (status, gcstatus, message etc) to logs database
kind can be status, gcstatus, gc_msg, (we only recv for those 3), kind can be status, gcstatus, gc_msg, (we only recv for those 3),
single_msg_recv, chat_msg_recv, chat_msg_sent, single_msg_sent single_msg_recv, chat_msg_recv, chat_msg_sent, single_msg_sent