From f0f5243e326f365caad0669bbc98e887bbed0349 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Wed, 1 Nov 2006 17:09:10 +0000 Subject: [PATCH] don't show pm event twice when we restore conversation. fixes #2621 --- src/chat_control.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chat_control.py b/src/chat_control.py index 457bace36..7a1b58c47 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -1609,13 +1609,13 @@ class ChatControl(ChatControlBase): return timeout = gajim.config.get('restore_timeout') # in minutes - events = gajim.events.get_events(self.account, jid, ['chat']) + events = gajim.events.get_events(self.account, jid, ['chat', 'pm']) # number of messages that are in queue and are already logged, we want # to avoid duplication pending_how_many = len(events) rows = gajim.logger.get_last_conversation_lines(jid, restore_how_many, - pending_how_many, timeout, self.account) + pending_how_many, timeout, self.account) local_old_kind = None for row in rows: # row[0] time, row[1] has kind, row[2] the message if not row[2]: # message is empty, we don't print it