From bd7bac578fefae6fe2cf25b8ee8b8b5731efbe32 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Sat, 25 Oct 2008 19:48:01 +0000 Subject: [PATCH] partial fix for renegotiating pm e2e sessions after one party disconnects --- src/chat_control.py | 2 +- src/common/connection_handlers.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/chat_control.py b/src/chat_control.py index 77ceca0ff..635e808d8 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -2583,7 +2583,7 @@ class ChatControl(ChatControlBase): if not self.session: fjid = self.contact.get_full_jid() - new_sess = gajim.connections[self.account].make_new_session(fjid) + new_sess = gajim.connections[self.account].make_new_session(fjid, type_=self.type_id) self.set_session(new_sess) self.session.negotiate_e2e(False) diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py index c06e6a747..2ef8342bf 100644 --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -1350,6 +1350,8 @@ sent a message to.''' return None def make_new_session(self, jid, thread_id=None, type_='chat', cls=None): + '''create and register a new session. thread_id=None to generate one. + type_ should be 'chat' or 'pm'.''' if not cls: cls = gajim.default_session_type