[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=28f46e3

The following commit has been merged in the master branch:
commit 28f46e30cdcdb58887e7283c43e4e7e04b85ece3
Author: Daniele E. Domenichelli <ddomenichelli at kde.org>
Date:   Wed Mar 6 13:53:53 2013 +0100

    Fix highlighting for consecutive messages
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
---
 lib/adium-theme-view.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index dc640e0..929e325 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -354,8 +354,14 @@ void AdiumThemeView::addContentMessage(const AdiumThemeContentInfo &contentMessa
     // contentMessage is const, we need a non-const one to append message classes
     AdiumThemeContentInfo message(contentMessage);
 
+    // 2 consecutive messages can be combined when:
+    //  * Sender is the same
+    //  * Message type is the same
+    //  * Both have the "mention" class, or none of them have it
+    //  * Theme does not disable consecutive messages
     if (m_lastContent.senderScreenName() == message.senderScreenName()
         && m_lastContent.type() == message.type()
+        && m_lastContent.messageClasses().contains(QLatin1String("mention")) == message.messageClasses().contains(QLatin1String("mention"))
         && !m_chatStyle->disableCombineConsecutive()) {
         consecutiveMessage = true;
         message.appendMessageClass(QLatin1String("consecutive"));

-- 
ktp-text-ui packaging