From c5cc462963363b2307a2a341da170829385a9589 Mon Sep 17 00:00:00 2001 From: mathieui Date: Thu, 17 Jan 2013 17:37:06 +0100 Subject: Move to the upstream SleekXMPP - remove the decline command that is not in the trunk (and mediated declines are supported nowhere anyway) - change a bit xhtml-im support - change the bookmarks management a bit - Add a verification to avoid crashing when poezio will be launched the next time - Fix the (unrelated) bug when setting a jid affiliation --- src/tabs.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/tabs.py') diff --git a/src/tabs.py b/src/tabs.py index 979db8e4..5836d072 100644 --- a/src/tabs.py +++ b/src/tabs.py @@ -526,7 +526,8 @@ class ChatTab(Tab): msg = self.core.xmpp.make_message(self.get_name()) msg['body'] = body - msg['xhtml_im'] = arg + msg.enable('html') + msg['html']['body'] = arg if isinstance(self, MucTab): msg['type'] = 'groupchat' if isinstance(self, ConversationTab): @@ -1193,7 +1194,8 @@ class MucTab(ChatTab): # be converted in xhtml. self.core.events.trigger('muc_say', msg, self) if msg['body'].find('\x19') != -1: - msg['xhtml_im'] = xhtml.poezio_colors_to_html(msg['body']) + msg.enable('html') + msg['html']['body'] = xhtml.poezio_colors_to_html(msg['body']) msg['body'] = xhtml.clean_text(msg['body']) if config.get_by_tabname('send_chat_states', 'true', self.general_jid, True) == 'true' and self.remote_wants_chatstates is not False: msg['chat_state'] = needed @@ -1820,7 +1822,8 @@ class PrivateTab(ChatTab): nick_color=get_theme().COLOR_OWN_NICK, identifier=msg['id']) if msg['body'].find('\x19') != -1: - msg['xhtml_im'] = xhtml.poezio_colors_to_html(msg['body']) + msg.enable('html') + msg['html']['body'] = xhtml.poezio_colors_to_html(msg['body']) msg['body'] = xhtml.clean_text(msg['body']) if config.get_by_tabname('send_chat_states', 'true', self.general_jid, True) == 'true' and self.remote_wants_chatstates is not False: needed = 'inactive' if self.inactive else 'active' @@ -2950,7 +2953,8 @@ class ConversationTab(ChatTab): nick_color=get_theme().COLOR_OWN_NICK, identifier=msg['id']) if msg['body'].find('\x19') != -1: - msg['xhtml_im'] = xhtml.poezio_colors_to_html(msg['body']) + msg.enable('html') + msg['html']['body'] = xhtml.poezio_colors_to_html(msg['body']) msg['body'] = xhtml.clean_text(msg['body']) if config.get_by_tabname('send_chat_states', 'true', self.general_jid, True) == 'true' and self.remote_wants_chatstates is not False: needed = 'inactive' if self.inactive else 'active' -- cgit v1.2.3