[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=251df04

The following commit has been merged in the master branch:
commit 251df047508f6ed143d56648efc76509ced2ed01
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Aug 30 11:20:58 2012 +0200

    Set the script to the AdiumThemeMessageInfo
---
 lib/chat-widget.cpp | 8 ++++++--
 lib/logmanager.cpp  | 9 ++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 1a148c1..b407095 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -673,7 +673,9 @@ void ChatWidget::handleIncomingMessage(const Tp::ReceivedMessage &message)
         } else {
             AdiumThemeContentInfo messageInfo(AdiumThemeMessageInfo::RemoteToLocal);
 
-            messageInfo.setMessage(MessageProcessor::instance()->processIncomingMessage(message).finalizedMessage());
+            Message processedMessage(MessageProcessor::instance()->processIncomingMessage(message));
+            messageInfo.setMessage(processedMessage.finalizedMessage());
+            messageInfo.setScript(processedMessage.finalizedScript());
 
             QDateTime time = message.sent();
             if (!time.isValid()) {
@@ -783,7 +785,9 @@ void ChatWidget::handleMessageSent(const Tp::Message &message, Tp::MessageSendin
     }
     else {
         AdiumThemeContentInfo messageInfo(AdiumThemeMessageInfo::LocalToRemote);
-        messageInfo.setMessage(MessageProcessor::instance()->processOutgoingMessage(message).finalizedMessage());
+        Message processedMessage(MessageProcessor::instance()->processOutgoingMessage(message));
+        messageInfo.setMessage(processedMessage.finalizedMessage());
+        messageInfo.setScript(processedMessage.finalizedScript());
 
         messageInfo.setTime(message.sent());
 
diff --git a/lib/logmanager.cpp b/lib/logmanager.cpp
index ac311a2..35700c0 100644
--- a/lib/logmanager.cpp
+++ b/lib/logmanager.cpp
@@ -185,12 +185,11 @@ void LogManager::onEventsFinished(Tpl::PendingOperation *po)
         }
         AdiumThemeContentInfo message(type);
 
-        if (type == AdiumThemeMessageInfo::HistoryLocalToRemote) {
-            message.setMessage(MessageProcessor::instance()->processOutgoingMessage(event).finalizedMessage());
-        } else {
-            message.setMessage(MessageProcessor::instance()->processIncomingMessage(event).finalizedMessage());
-        }
+        Message processedEvent(type == AdiumThemeMessageInfo::HistoryLocalToRemote ? MessageProcessor::instance()->processOutgoingMessage(event)
+                                                                                   : MessageProcessor::instance()->processIncomingMessage(event));
 
+        message.setMessage(processedEvent.finalizedMessage());
+        message.setScript(processedEvent.finalizedScript());
         message.setService(m_account->serviceName());
         message.setSenderDisplayName(event->sender()->alias());
         message.setSenderScreenName(event->sender()->alias());

-- 
ktp-text-ui packaging