forgot to remove an useless line in the previous commit...
This commit is contained in:
parent
714b7d965d
commit
5e744a3e8e
|
@ -2016,7 +2016,6 @@ class Connection(CommonConnection, ConnectionHandlers):
|
|||
self.add_lang(p)
|
||||
if not change_nick:
|
||||
t = p.setTag(common.xmpp.NS_MUC + ' x')
|
||||
last_date = self.last_history_time[room_jid]
|
||||
last_date = max(self.last_history_time[room_jid],
|
||||
time.time() - gajim.config.get('muc_restore_timeout') * 60)
|
||||
last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(last_date))
|
||||
|
|
|
@ -974,8 +974,13 @@ class Logger:
|
|||
(account_jid_id, jid_id))
|
||||
# Then we add all new groups information
|
||||
for group in groups:
|
||||
try:
|
||||
self.cur.execute('INSERT INTO roster_group VALUES(?, ?, ?)',
|
||||
(account_jid_id, jid_id, group))
|
||||
except IntegrityError:
|
||||
# Some servers (like jabberd) seems to put contact twice in the
|
||||
# roster. So we do nothing if it appears. (see #5206)
|
||||
pass
|
||||
|
||||
if name is None:
|
||||
name = ''
|
||||
|
|
Loading…
Reference in New Issue