[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=e7cf64c

The following commit has been merged in the master branch:
commit e7cf64ce20fa792dc246566a8c1f59c5f21106d3
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Sep 20 00:49:47 2011 +0100

    fix messageClasses in theme
---
 lib/adium-theme-view.cpp  | 3 +++
 lib/chat-window-style.cpp | 6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index ae6049e..15751c0 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -458,6 +458,9 @@ QString AdiumThemeView::replaceMessageKeywords(QString &htmlTemplate, const Adiu
         htmlTemplate.replace(pos , timeRegExp.cap(0).length() , timeKeyword);
     }
 
+    htmlTemplate.replace(QLatin1String("%messageClasses%"), info.messageClasses());
+
+
     return htmlTemplate;
 }
 
diff --git a/lib/chat-window-style.cpp b/lib/chat-window-style.cpp
index 4e95993..8242d90 100644
--- a/lib/chat-window-style.cpp
+++ b/lib/chat-window-style.cpp
@@ -394,11 +394,7 @@ void ChatWindowStyle::readStyleFiles()
     }
 
     if (d->nextOutgoingHtml.isEmpty()) {
-        if (d->nextIncomingHtml.isEmpty()) {
-            d->nextOutgoingHtml = d->outgoingHtml;
-        } else {
-            d->nextOutgoingHtml = d->nextIncomingHtml;
-        }
+        d->nextOutgoingHtml = d->nextIncomingHtml;
     }
 
     // Load status file

-- 
ktp-text-ui packaging