copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Yann Leboulanger 2008-11-05 18:25:40 +00:00
parent 573ddce6c7
commit a368839123
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chat_control.py
View File

@ -48,7 +48,6 @@ from message_textview import MessageTextView
from common.contacts import GC_Contact from common.contacts import GC_Contact
from common.logger import Constants from common.logger import Constants
constants = Constants() constants = Constants()
from common.rst_xhtml_generator import create_xhtml
from common.pep import MOODS, ACTIVITIES 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_XHTML, NS_FILE, NS_MUC, NS_RECEIPTS
from common.xmpp.protocol import NS_ESESSION from common.xmpp.protocol import NS_ESESSION
@ -1872,6 +1871,7 @@ class ChatControl(ChatControlBase):
name = gajim.nicks[self.account] name = gajim.nicks[self.account]
if not xhtml and not encrypted and gajim.config.get( if not xhtml and not encrypted and gajim.config.get(
'rst_formatting_outgoing_messages'): 'rst_formatting_outgoing_messages'):
from common.rst_xhtml_generator import create_xhtml
xhtml = create_xhtml(text) xhtml = create_xhtml(text)
if xhtml: if xhtml:
xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml) xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml)

5
src/common/connection.py
View File

@ -58,8 +58,6 @@ from common import exceptions
from connection_handlers import * from connection_handlers import *
from common.rst_xhtml_generator import create_xhtml
from string import Template from string import Template
import logging import logging
log = logging.getLogger('gajim.c.connection') log = logging.getLogger('gajim.c.connection')
@ -1078,6 +1076,7 @@ class Connection(ConnectionHandlers):
if not self.connection: if not self.connection:
return 1 return 1
if msg and not xhtml and gajim.config.get('rst_formatting_outgoing_messages'): 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) xhtml = create_xhtml(msg)
if not msg and chatstate is None and form_node is None: if not msg and chatstate is None and form_node is None:
return 2 return 2
@ -1113,6 +1112,7 @@ class Connection(ConnectionHandlers):
if msgtxt and not xhtml and gajim.config.get( if msgtxt and not xhtml and gajim.config.get(
'rst_formatting_outgoing_messages'): 'rst_formatting_outgoing_messages'):
# Generate a XHTML part using reStructured text markup # Generate a XHTML part using reStructured text markup
from common.rst_xhtml_generator import create_xhtml
xhtml = create_xhtml(msgtxt) xhtml = create_xhtml(msgtxt)
if type_ == 'chat': if type_ == 'chat':
msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, typ = type_, msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, typ = type_,
@ -1558,6 +1558,7 @@ class Connection(ConnectionHandlers):
if not self.connection: if not self.connection:
return return
if not xhtml and gajim.config.get('rst_formatting_outgoing_messages'): if not xhtml and gajim.config.get('rst_formatting_outgoing_messages'):
from common.rst_xhtml_generator import create_xhtml
xhtml = create_xhtml(msg) xhtml = create_xhtml(msg)
msg_iq = common.xmpp.Message(jid, msg, typ = 'groupchat', xhtml = xhtml) msg_iq = common.xmpp.Message(jid, msg, typ = 'groupchat', xhtml = xhtml)
self.connection.send(msg_iq) self.connection.send(msg_iq)