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

count as pending events message from other resources too. see #2657

Browse source
This commit is contained in:
Yann Leboulanger 2006-11-11 14:47:08 +00:00
parent 2f354b464d
commit ed5930a1b1
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/chat_control.py
View file

@ -1612,10 +1612,13 @@ class ChatControl(ChatControlBase):
return return
timeout = gajim.config.get('restore_timeout') # in minutes timeout = gajim.config.get('restore_timeout') # in minutes
events = gajim.events.get_events(self.account, jid, ['chat', 'pm'])
# number of messages that are in queue and are already logged, we want # number of messages that are in queue and are already logged, we want
# to avoid duplication # to avoid duplication
pending_how_many = len(events) pending_how_many = len(gajim.events.get_events(self.account, jid,
['chat', 'pm']))
if self.resource:
pending_how_many += len(gajim.events.get_events(self.account,
self.contact.get_full_jid(), ['chat', 'pm']))
rows = gajim.logger.get_last_conversation_lines(jid, restore_how_many, rows = gajim.logger.get_last_conversation_lines(jid, restore_how_many,
pending_how_many, timeout, self.account) pending_how_many, timeout, self.account)