fix so we log muc messages [was broken only in svn]
This commit is contained in:
parent
61b55f4312
commit
45b1493471
|
@ -2190,7 +2190,7 @@ class Connection:
|
||||||
#last date/time in history to avoid duplicate
|
#last date/time in history to avoid duplicate
|
||||||
jid='%s@%s' % (room, server)
|
jid='%s@%s' % (room, server)
|
||||||
last_log = gajim.logger.get_last_date_that_has_logs(jid)
|
last_log = gajim.logger.get_last_date_that_has_logs(jid)
|
||||||
if not last_log:
|
if last_log is None:
|
||||||
last_log = 0
|
last_log = 0
|
||||||
self.last_history_line[jid]= last_log
|
self.last_history_line[jid]= last_log
|
||||||
|
|
||||||
|
|
|
@ -402,5 +402,5 @@ class Logger:
|
||||||
AND kind NOT IN (?, ?)
|
AND kind NOT IN (?, ?)
|
||||||
ORDER BY time DESC LIMIT 1
|
ORDER BY time DESC LIMIT 1
|
||||||
''', (jid_id, constants.KIND_STATUS, constants.KIND_GCSTATUS))
|
''', (jid_id, constants.KIND_STATUS, constants.KIND_GCSTATUS))
|
||||||
result = self.cur.fetchone()
|
result = self.cur.fetchone()[0]
|
||||||
return result
|
return result
|
||||||
|
|
|
@ -125,7 +125,7 @@ class HistoryWindow:
|
||||||
if result is None:
|
if result is None:
|
||||||
date = time.localtime()
|
date = time.localtime()
|
||||||
else:
|
else:
|
||||||
tim = result[0]
|
tim = result
|
||||||
date = time.localtime(tim)
|
date = time.localtime(tim)
|
||||||
|
|
||||||
y, m, d = date[0], date[1], date[2]
|
y, m, d = date[0], date[1], date[2]
|
||||||
|
|
Loading…
Reference in New Issue