[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=901fc47

The following commit has been merged in the master branch:
commit 901fc4713865e966ba49502015266181862476a6
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Feb 28 11:45:39 2012 +0100

    Fix loading of themes including only Content.html instead of {Incoming,Outgoing}/Content.html
---
 lib/chat-window-style.cpp | 2 ++
 lib/chat-window-style.h   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/lib/chat-window-style.cpp b/lib/chat-window-style.cpp
index 1a2ac44..600d306 100644
--- a/lib/chat-window-style.cpp
+++ b/lib/chat-window-style.cpp
@@ -311,6 +311,7 @@ void ChatWindowStyle::readStyleFiles()
     templateFiles.insert(Status, QLatin1String("Status.html"));
 
     templateFiles.insert(Header, QLatin1String("Header.html"));
+    templateFiles.insert(Content, QLatin1String("Content.html"));
     templateFiles.insert(Footer, QLatin1String("Footer.html"));
 
     templateFiles.insert(Incoming, QLatin1String("Incoming/Content.html"));
@@ -358,6 +359,7 @@ void ChatWindowStyle::readStyleFiles()
     }
 
     // basic fallbacks
+    inheritContent(Incoming, Content);
     inheritContent(IncomingNext, Incoming);
 
     inheritContent(Outgoing, Incoming);
diff --git a/lib/chat-window-style.h b/lib/chat-window-style.h
index cd1280d..36f5367 100644
--- a/lib/chat-window-style.h
+++ b/lib/chat-window-style.h
@@ -168,6 +168,7 @@ private:
         Status,
 
         Header,
+        Content,
         Footer,
 
         Incoming,

-- 
ktp-text-ui packaging