[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=24be20b

The following commit has been merged in the master branch:
commit 24be20b7b555c49dd9cd66269263d4c5a5ad78bf
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Feb 28 22:35:32 2012 +0100

    Insert message classes before user set ones
---
 lib/adium-theme-message-info.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/adium-theme-message-info.cpp b/lib/adium-theme-message-info.cpp
index 15b611e..4a28506 100644
--- a/lib/adium-theme-message-info.cpp
+++ b/lib/adium-theme-message-info.cpp
@@ -116,7 +116,7 @@ QString AdiumThemeMessageInfo::messageClasses() const {
     //in the future this will also contain history, consecutive, autoreply, status, event
     //these will be stored internally as flags
 
-    QStringList classes = d->messageClasses;
+    QStringList classes;
 
     if (d->type == RemoteToLocal) {
         classes.append(QLatin1String("incoming"));
@@ -144,6 +144,8 @@ QString AdiumThemeMessageInfo::messageClasses() const {
         classes.append(QLatin1String("message"));
     }
 
+    classes << d->messageClasses;
+
     return classes.join(QLatin1String(" "));
 }
 

-- 
ktp-text-ui packaging