[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=17a7c52

The following commit has been merged in the master branch:
commit 17a7c522f43b0e07170fb33a1f982c2ab64a0872
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Jun 12 21:54:55 2013 +0100

    Make sure to set messages as history where applicable
    
    This solves a bug in which messages in history could still group together with new messages
    
    CCBUG: 292041
---
 lib/adium-theme-view.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index 12f5b01..635a877 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -361,9 +361,17 @@ void AdiumThemeView::addMessage(const KTp::Message &message)
     } else {
         AdiumThemeContentInfo messageInfo;
         if (message.direction() == KTp::Message::RemoteToLocal) {
-            messageInfo = AdiumThemeContentInfo(AdiumThemeContentInfo::RemoteToLocal);
+            if (message.isHistory()) {
+                messageInfo = AdiumThemeContentInfo(AdiumThemeContentInfo::HistoryRemoteToLocal);
+            } else {
+                messageInfo = AdiumThemeContentInfo(AdiumThemeContentInfo::RemoteToLocal);
+            }
         } else {
-            messageInfo = AdiumThemeContentInfo(AdiumThemeContentInfo::LocalToRemote);
+            if (message.isHistory()) {
+                messageInfo = AdiumThemeContentInfo(AdiumThemeContentInfo::HistoryLocalToRemote);
+            } else {
+                messageInfo = AdiumThemeContentInfo(AdiumThemeContentInfo::LocalToRemote);
+            }
         }
 
         messageInfo.setMessage(message.finalizedMessage());

-- 
ktp-text-ui packaging