summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-11-08 00:41:32 +0100
committerFlorent Le Coz <louiz@louiz.org>2011-11-08 00:41:32 +0100
commit9c5cab09d40d45a115a233ba17cec4387c63c893 (patch)
tree3582c2124c803b09c035fad8f368578f106627e0
parent52599f9b8cbd37e922d959e482521a4e16121582 (diff)
downloadpoezio-9c5cab09d40d45a115a233ba17cec4387c63c893.tar.gz
poezio-9c5cab09d40d45a115a233ba17cec4387c63c893.tar.bz2
poezio-9c5cab09d40d45a115a233ba17cec4387c63c893.tar.xz
poezio-9c5cab09d40d45a115a233ba17cec4387c63c893.zip
fix the last errors that are in another commit that I don’t want
to cherry-pick.
-rw-r--r--src/tabs.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tabs.py b/src/tabs.py
index 08105a58..5d7f2286 100644
--- a/src/tabs.py
+++ b/src/tabs.py
@@ -1202,14 +1202,14 @@ class PrivateTab(ChatTab):
msg = self.core.xmpp.make_message(self.get_name())
msg['type'] = 'chat'
msg['body'] = line
+ self.core.add_message_to_text_buffer(self._text_buffer, msg['body'], None, self.core.own_nick or self.own_nick)
if msg['body'].find('\x19') != -1:
- msg['body'] = xhtml.clean_text(msg['body'])
msg['xhtml_im'] = xhtml.poezio_colors_to_html(msg['body'])
+ msg['body'] = xhtml.clean_text(msg['body'])
if config.get('send_chat_states', 'true') == 'true' and self.remote_wants_chatstates is not False:
needed = 'inactive' if self.core.status.show in ('xa', 'away') else 'active'
msg['chat_state'] = needed
msg.send()
- self.core.add_message_to_text_buffer(self._text_buffer, xhtml.convert_simple_to_full_colors(line), None, self.core.own_nick or self.own_nick)
self.cancel_paused_delay()
self.text_win.refresh()
self.input.refresh()
@@ -1864,14 +1864,14 @@ class ConversationTab(ChatTab):
msg = self.core.xmpp.make_message(self.get_name())
msg['type'] = 'chat'
msg['body'] = line
+ self.core.add_message_to_text_buffer(self._text_buffer, msg['body'], None, self.core.own_nick)
if msg['body'].find('\x19') != -1:
- msg['body'] = xhtml.clean_text(msg['body'])
msg['xhtml_im'] = xhtml.poezio_colors_to_html(msg['body'])
+ msg['body'] = xhtml.clean_text(msg['body'])
if config.get('send_chat_states', 'true') == 'true' and self.remote_wants_chatstates is not False:
needed = 'inactive' if self.core.status.show in ('xa', 'away') else 'active'
msg['chat_state'] = needed
msg.send()
- self.core.add_message_to_text_buffer(self._text_buffer, xhtml.convert_simple_to_full_colors(line), None, self.core.own_nick)
logger.log_message(JID(self.get_name()).bare, self.core.own_nick, line)
self.cancel_paused_delay()
self.text_win.refresh()