From cac215909b52b6d5736b0ebec00b0b3c33b1e89e Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sun, 30 Aug 2009 11:58:41 +0200
Subject: [PATCH] disable RST generator only for GPG encrypted messages, not
E2E
---
src/chat_control.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/chat_control.py b/src/chat_control.py
index 82f3270477..361113c635 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -1989,8 +1989,8 @@ class ChatControl(ChatControlBase):
else:
kind = 'outgoing'
name = gajim.nicks[self.account]
- if not xhtml and not encrypted and gajim.config.get(
- 'rst_formatting_outgoing_messages'):
+ if not xhtml and not (encrypted and self.gpg_is_active) and \
+ gajim.config.get('rst_formatting_outgoing_messages'):
from common.rst_xhtml_generator import create_xhtml
xhtml = create_xhtml(text)
if xhtml:
--
GitLab