[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=3e9a6bd

The following commit has been merged in the master branch:
commit 3e9a6bd87a0dcc72e077bcfce4f2863470b2ce11
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Feb 28 20:46:24 2012 +0100

    Append "consecutive" class to consecutive messages
---
 lib/adium-theme-view.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index 1ff9452..1302111 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -292,15 +292,20 @@ void AdiumThemeView::addContentMessage(const AdiumThemeContentInfo &contentMessa
 {
     QString styleHtml;
     bool consecutiveMessage = false;
+    // contentMessage is const, we need a non-const one to append message classes
+    AdiumThemeContentInfo message(contentMessage);
 
-    if (m_lastContent.senderScreenName() == contentMessage.senderScreenName()
-        && m_lastContent.type() == contentMessage.type() )
+    if (m_lastContent.senderScreenName() == message.senderScreenName()
+        && m_lastContent.type() == message.type() )
     {
+        // TODO check if adding the "consecutive" class is a problem for themes
+        // with disableCombineConsecutive = true
         consecutiveMessage = true;
+        message.appendMessageClass(QLatin1String("consecutive"));
     }
-    m_lastContent = contentMessage;
+    m_lastContent = message;
 
-    switch (contentMessage.type()) {
+    switch (message.type()) {
     case AdiumThemeMessageInfo::RemoteToLocal:
         if (consecutiveMessage) {
             styleHtml = m_chatStyle->getNextIncomingHtml();
@@ -333,7 +338,7 @@ void AdiumThemeView::addContentMessage(const AdiumThemeContentInfo &contentMessa
         kWarning() << "Unexpected message type to addContentMessage";
     }
 
-    replaceContentKeywords(styleHtml, contentMessage);
+    replaceContentKeywords(styleHtml, message);
 
     if (consecutiveMessage) {
         appendNextMessage(styleHtml);

-- 
ktp-text-ui packaging