diff options
| author | Florent Le Coz <louiz@louiz.org> | 2011-11-06 19:24:37 +0100 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2011-11-06 19:24:37 +0100 |
| commit | 6a0ac419c5c1d259171a5d49e323f23cd181462c (patch) | |
| tree | 1c18c4bb890cd9b2ea425bdc67c4feff52f9e99c /src/tabs.py | |
| parent | 07f9fab401f34753d0619ebb8d65f6f9df97931d (diff) | |
| parent | 0315b05f5122f1f4697699fc09de1b0860203177 (diff) | |
| download | poezio-6a0ac419c5c1d259171a5d49e323f23cd181462c.tar.gz poezio-6a0ac419c5c1d259171a5d49e323f23cd181462c.tar.bz2 poezio-6a0ac419c5c1d259171a5d49e323f23cd181462c.tar.xz poezio-6a0ac419c5c1d259171a5d49e323f23cd181462c.zip | |
Merge branch 'master' into plugins
Diffstat (limited to 'src/tabs.py')
| -rw-r--r-- | src/tabs.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/tabs.py b/src/tabs.py index 63b1628f..78f56bdb 100644 --- a/src/tabs.py +++ b/src/tabs.py @@ -1217,7 +1217,7 @@ class PrivateTab(ChatTab): 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, line, None, self.core.own_nick or self.own_nick) + 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() @@ -1579,7 +1579,6 @@ class RosterInfoTab(Tab): self.command_add(jid.lstrip('\n')) self.core.information('Contacts imported from %s' % filepath, 'Info') - def command_export(self, arg): """ Export the contacts @@ -1881,7 +1880,7 @@ class ConversationTab(ChatTab): 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, line, None, self.core.own_nick) + 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() |