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

revert wrong behaviour. see #5527

This commit is contained in:
Yann Leboulanger 2010-01-03 19:21:39 +01:00
parent ee702b8660
commit 61ffd6f91f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/connection.py
View File

@ -2016,8 +2016,13 @@ class Connection(CommonConnection, ConnectionHandlers):
self.add_lang(p)
if not change_nick:
t = p.setTag(common.xmpp.NS_MUC + ' x')
last_date = max(self.last_history_time[room_jid],
time.time() - gajim.config.get('muc_restore_timeout') * 60)
last_date = self.last_history_time[room_jid]
if last_date == 0:
last_date = time.time() - gajim.config.get(
'muc_restore_timeout') * 60
else:
last_date = min(last_date, time.time() - gajim.config.get(
'muc_restore_timeout') * 60)
last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(last_date))
t.setTag('history', {'maxstanzas': gajim.config.get(
'muc_restore_lines'), 'since': last_date})