From a604f75912ccaeff10346c236964590fbab1f392 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Thu, 12 Aug 2010 11:03:04 +0200 Subject: [PATCH] don't try to start archiving session if server doesn't support it. Fixes #5845 --- 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 3fd462a00..0f8fd07ba 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -2677,7 +2677,8 @@ class ChatControl(ChatControlBase): if want_e2e and not self.no_autonegotiation \ and gajim.HAVE_PYCRYPTO and self.contact.supports(NS_ESESSION): self.begin_e2e_negotiation() - elif not self.session or not self.session.status: + elif (not self.session or not self.session.status) and \ + gajim.connections[self.account].archiving_supported: self.begin_archiving_negotiation() else: self.send_chatstate('active', self.contact)