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

prevent traceback when changing nick

Browse source
This commit is contained in:
Yann Leboulanger 2009-08-27 20:15:54 +02:00
parent 88fe4f8e36
commit 4438154eb0
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/connection.py
View file

@ -1746,16 +1746,17 @@ class Connection(ConnectionHandlers):
self.add_lang(p) self.add_lang(p)
if not change_nick: if not change_nick:
t = p.setTag(common.xmpp.NS_MUC + ' x') t = p.setTag(common.xmpp.NS_MUC + ' x')
last_date = gajim.logger.get_last_date_that_has_logs(room_jid, self.name, last_date = gajim.logger.get_last_date_that_has_logs(room_jid,
is_room=True) self.name, is_room=True)
if last_date is None: if last_date is None:
last_date = time.time() - gajim.config.get('muc_restore_timeout') * 60 last_date = time.time() - gajim.config.get(
'muc_restore_timeout') * 60
else: else:
last_time = min(last_date, time.time() - gajim.config.get( last_time = min(last_date, time.time() - gajim.config.get(
'muc_restore_timeout') * 60) 'muc_restore_timeout') * 60)
last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(last_date)) last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(last_date))
t.setTag('history', {'maxstanzas': gajim.config.get('muc_restore_lines'), t.setTag('history', {'maxstanzas': gajim.config.get(
'since': last_date}) 'muc_restore_lines'), 'since': last_date})
if password: if password:
t.setTagData('password', password) t.setTagData('password', password)
self.connection.send(p) self.connection.send(p)