Skip to content
Snippets Groups Projects
Commit a3688391 authored by Yann Leboulanger's avatar Yann Leboulanger
Browse files

[thorstenp] import rst generator only when needed. see #4457

parent 573ddce6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/chat_control.py
+ 1
− 1
View file @ a3688391
......@@ -48,7 +48,6 @@ from message_textview import MessageTextView
from common.contacts import GC_Contact
from common.logger import Constants
constants = Constants()
from common.rst_xhtml_generator import create_xhtml
from common.pep import MOODS, ACTIVITIES
from common.xmpp.protocol import NS_XHTML, NS_FILE, NS_MUC, NS_RECEIPTS
from common.xmpp.protocol import NS_ESESSION
......@@ -1872,6 +1871,7 @@ class ChatControl(ChatControlBase):
name = gajim.nicks[self.account]
if not xhtml and not encrypted and gajim.config.get(
'rst_formatting_outgoing_messages'):
from common.rst_xhtml_generator import create_xhtml
xhtml = create_xhtml(text)
if xhtml:
xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml)
......
src/common/connection.py
+ 3
− 2
View file @ a3688391
......@@ -58,8 +58,6 @@ from common import exceptions
from connection_handlers import *
from common.rst_xhtml_generator import create_xhtml
from string import Template
import logging
log = logging.getLogger('gajim.c.connection')
......@@ -1078,6 +1076,7 @@ class Connection(ConnectionHandlers):
if not self.connection:
return 1
if msg and not xhtml and gajim.config.get('rst_formatting_outgoing_messages'):
from common.rst_xhtml_generator import create_xhtml
xhtml = create_xhtml(msg)
if not msg and chatstate is None and form_node is None:
return 2
......@@ -1113,6 +1112,7 @@ class Connection(ConnectionHandlers):
if msgtxt and not xhtml and gajim.config.get(
'rst_formatting_outgoing_messages'):
# Generate a XHTML part using reStructured text markup
from common.rst_xhtml_generator import create_xhtml
xhtml = create_xhtml(msgtxt)
if type_ == 'chat':
msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, typ = type_,
......@@ -1558,6 +1558,7 @@ class Connection(ConnectionHandlers):
if not self.connection:
return
if not xhtml and gajim.config.get('rst_formatting_outgoing_messages'):
from common.rst_xhtml_generator import create_xhtml
xhtml = create_xhtml(msg)
msg_iq = common.xmpp.Message(jid, msg, typ = 'groupchat', xhtml = xhtml)
self.connection.send(msg_iq)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment