From 76a04153bef2dfab7fceedce27ca2c1f55f42c61 Mon Sep 17 00:00:00 2001 From: Jose Rostagno Date: Mon, 12 Sep 2011 12:54:13 -0300 Subject: [PATCH] fix regresion that switch incoming/outgoing messages --- emesene/gui/base/Conversation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emesene/gui/base/Conversation.py b/emesene/gui/base/Conversation.py index d5b1ff507..d42827575 100644 --- a/emesene/gui/base/Conversation.py +++ b/emesene/gui/base/Conversation.py @@ -403,7 +403,7 @@ def _on_send_message(self, text): message = e3.Message(e3.Message.TYPE_MESSAGE, text, None, self.cstyle) msg = self._pre_process_message(self.session.contacts.me, - message, True, cedict, self.emcache.path, message.timestamp, + message, False, cedict, self.emcache.path, message.timestamp, message.type, self.cstyle) self.output.send_message(self.formatter, msg) @@ -428,7 +428,7 @@ def on_receive_message(self, message, account, received_custom_emoticons): user_emcache = self.caches.get_emoticon_cache(account) msg = self._pre_process_message(contact, - message, False, received_custom_emoticons, user_emcache.path, + message, True, received_custom_emoticons, user_emcache.path, message.timestamp, message.type, message.style) self.output.receive_message(self.formatter, msg)