From b9db39e0a9d6411525089aaba556d76b69783c23 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Sun, 12 Oct 2008 00:51:24 +0000 Subject: [PATCH] disable autonegotiation if e2e is manually started or started by a failed decrypt --- src/chat_control.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/chat_control.py b/src/chat_control.py index 0065b06a1..93489437a 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -2342,7 +2342,6 @@ class ChatControl(ChatControlBase): NS_ESESSION) and not gajim.capscache.is_supported( self.contact, 'notexistant'): self.begin_e2e_negotiation() - self.no_autonegotiation = True else: self.send_chatstate('active', self.contact) @@ -2577,6 +2576,8 @@ class ChatControl(ChatControlBase): self.begin_e2e_negotiation() def begin_e2e_negotiation(self): + self.no_autonegotiation = True + if not self.session: fjid = self.contact.get_full_jid() new_sess = gajim.connections[self.account].make_new_session(fjid)