From a8151d8dc2fd75b2698911ba367e03d7e50933e7 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Tue, 27 Aug 2013 17:24:41 +0200
Subject: [PATCH] don't create a new session when we get an error message in a
pm. Fixes #7435
---
src/common/connection_handlers.py | 11 +++++++++++
src/common/connection_handlers_events.py | 13 +++++++++++--
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index 9fab409e0a..da336aa8f2 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -1367,6 +1367,17 @@ class ConnectionHandlersBase:
else:
return None
+ def get_latest_session(self, jid):
+ """
+ Get the session that we last sent a message to
+ """
+ if jid not in self.sessions:
+ return None
+ sessions = self.sessions[jid].values()
+ if not sessions:
+ return None
+ return sorted(sessions, key=operator.attrgetter('last_send'))[-1]
+
def find_controlless_session(self, jid, resource=None):
"""
Find an active session that doesn't have a control attached
diff --git a/src/common/connection_handlers_events.py b/src/common/connection_handlers_events.py
index 94f3eabdd5..8a9202e5c5 100644
--- a/src/common/connection_handlers_events.py
+++ b/src/common/connection_handlers_events.py
@@ -1109,8 +1109,17 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
self.session = None
if self.mtype != 'groupchat':
- self.session = self.conn.get_or_create_session(self.fjid,
- self.thread_id)
+ if gajim.interface.is_pm_contact(self.fjid, account) and \
+ self.mtype == 'error':
+ self.session = self.conn.find_session(self.fjid, self.thread_id)
+ if not self.session:
+ self.session = self.conn.get_latest_session(self.fjid)
+ if not self.session:
+ self.session = self.conn.make_new_session(self.fjid,
+ self.thread_id, type_='pm')
+ else:
+ self.session = self.conn.get_or_create_session(self.fjid,
+ self.thread_id)
if self.thread_id and not self.session.received_thread_id:
self.session.received_thread_id = True
--
GitLab