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

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

    Fix HTML theme loading preference
---
 lib/chat-window-style.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/chat-window-style.cpp b/lib/chat-window-style.cpp
index 3b54c75..4e95993 100644
--- a/lib/chat-window-style.cpp
+++ b/lib/chat-window-style.cpp
@@ -394,7 +394,11 @@ void ChatWindowStyle::readStyleFiles()
     }
 
     if (d->nextOutgoingHtml.isEmpty()) {
-        d->nextOutgoingHtml = d->outgoingHtml;
+        if (d->nextIncomingHtml.isEmpty()) {
+            d->nextOutgoingHtml = d->outgoingHtml;
+        } else {
+            d->nextOutgoingHtml = d->nextIncomingHtml;
+        }
     }
 
     // Load status file

-- 
ktp-text-ui packaging