diff options
| author | Brendan Taylor <bct@diffeq.com> | 2008-10-12 04:51:24 +0400 |
|---|---|---|
| committer | Brendan Taylor <bct@diffeq.com> | 2008-10-12 04:51:24 +0400 |
| commit | b9db39e0a9d6411525089aaba556d76b69783c23 (patch) | |
| tree | c832bb9f0abfa8170cea15efc3b13deff5625c57 /src | |
| parent | 8757449816555b526c6d22a9a76c9b5267c6b69a (diff) | |
disable autonegotiation if e2e is manually started or started by a
failed decrypt
Diffstat (limited to 'src')
| -rw-r--r-- | src/chat_control.py | 3 |
1 files changed, 2 insertions, 1 deletions
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) |