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

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

    Properly handle inherited content
---
 lib/chat-window-style.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/chat-window-style.cpp b/lib/chat-window-style.cpp
index 600d306..c703dab 100644
--- a/lib/chat-window-style.cpp
+++ b/lib/chat-window-style.cpp
@@ -360,16 +360,22 @@ void ChatWindowStyle::readStyleFiles()
 
     // basic fallbacks
     inheritContent(Incoming, Content);
-    inheritContent(IncomingNext, Incoming);
+    inheritContent(Outgoing, Content);
 
     inheritContent(Outgoing, Incoming);
+    inheritContent(Incoming, Outgoing);
+
+    inheritContent(OutgoingNext, IncomingNext);
+    inheritContent(IncomingNext, Incoming);
     inheritContent(OutgoingNext, Outgoing);
 
+    inheritContent(HistoryOutgoing, HistoryIncoming);
     inheritContent(HistoryIncoming, Incoming);
-    inheritContent(HistoryIncomingNext, IncomingNext);
+    inheritContent(HistoryOutgoing, Outgoing);
 
-    inheritContent(HistoryOutgoing, HistoryIncoming);
     inheritContent(HistoryOutgoingNext, HistoryIncomingNext);
+    inheritContent(HistoryIncomingNext, IncomingNext);
+    inheritContent(HistoryOutgoingNext, OutgoingNext);
 
     // Load template file fallback
     if (content(Template).isEmpty())

-- 
ktp-text-ui packaging