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

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

    Inherit Status from Content
---
 lib/chat-window-style.cpp | 4 +++-
 lib/chat-window-style.h   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/chat-window-style.cpp b/lib/chat-window-style.cpp
index c703dab..282aaf9 100644
--- a/lib/chat-window-style.cpp
+++ b/lib/chat-window-style.cpp
@@ -308,7 +308,6 @@ void ChatWindowStyle::readStyleFiles()
     // specify the files for the identifiers
     QHash<InternalIdentifier, QLatin1String> templateFiles;
     templateFiles.insert(Template, QLatin1String("Template.html"));
-    templateFiles.insert(Status, QLatin1String("Status.html"));
 
     templateFiles.insert(Header, QLatin1String("Header.html"));
     templateFiles.insert(Content, QLatin1String("Content.html"));
@@ -318,6 +317,7 @@ void ChatWindowStyle::readStyleFiles()
     templateFiles.insert(IncomingNext, QLatin1String("Incoming/NextContent.html"));
     templateFiles.insert(Outgoing, QLatin1String("Outgoing/Content.html"));
     templateFiles.insert(OutgoingNext, QLatin1String("Outgoing/NextContent.html"));
+    templateFiles.insert(Status, QLatin1String("Status.html"));
 
     templateFiles.insert(HistoryIncoming, QLatin1String("Incoming/Context.html"));
     templateFiles.insert(HistoryIncomingNext, QLatin1String("Incoming/NextContext.html"));
@@ -377,6 +377,8 @@ void ChatWindowStyle::readStyleFiles()
     inheritContent(HistoryIncomingNext, IncomingNext);
     inheritContent(HistoryOutgoingNext, OutgoingNext);
 
+    inheritContent(Status, Content);
+
     // Load template file fallback
     if (content(Template).isEmpty())
     {
diff --git a/lib/chat-window-style.h b/lib/chat-window-style.h
index 36f5367..32b76ea 100644
--- a/lib/chat-window-style.h
+++ b/lib/chat-window-style.h
@@ -165,7 +165,6 @@ private:
 
     enum InternalIdentifier {
         Template,
-        Status,
 
         Header,
         Content,
@@ -175,6 +174,7 @@ private:
         IncomingNext,
         Outgoing,
         OutgoingNext,
+        Status,
 
         HistoryIncoming,
         HistoryIncomingNext,

-- 
ktp-text-ui packaging