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

The following commit has been merged in the master branch:
commit 3a595c042d9d68c632550951758ecdd04a894657
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Mar 21 00:10:00 2012 +0100

    Add methods to get MessageViewVersion from Info.plist
---
 lib/chat-window-style.cpp | 8 ++++++++
 lib/chat-window-style.h   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/lib/chat-window-style.cpp b/lib/chat-window-style.cpp
index f827169..ef01fc2 100644
--- a/lib/chat-window-style.cpp
+++ b/lib/chat-window-style.cpp
@@ -41,6 +41,7 @@ public:
     QString defaultFontFamily;
     int     defaultFontSize;
     bool    disableCombineConsecutive;
+    int     messageViewVersion;
 
     QHash<int, QString> templateContents;
     QHash<QString, bool> compactVariants;
@@ -139,6 +140,11 @@ bool ChatWindowStyle::disableCombineConsecutive() const
     return d->disableCombineConsecutive;
 }
 
+int ChatWindowStyle::messageViewVersion() const
+{
+    return d->messageViewVersion;
+}
+
 QString ChatWindowStyle::getStyleBaseHref() const
 {
     return d->baseHref;
@@ -321,9 +327,11 @@ void ChatWindowStyle::readStyleFiles()
     d->defaultFontFamily  = plistReader.defaultFontFamily();
     d->defaultFontSize    = plistReader.defaultFontSize();
     d->disableCombineConsecutive = plistReader.disableCombineConsecutive();
+    d->messageViewVersion = plistReader.messageViewVersion();
 
     // specify the files for the identifiers
     QHash<InternalIdentifier, QLatin1String> templateFiles;
+
     templateFiles.insert(Template, QLatin1String("Template.html"));
 
     templateFiles.insert(Header, QLatin1String("Header.html"));
diff --git a/lib/chat-window-style.h b/lib/chat-window-style.h
index bbb504d..3474941 100644
--- a/lib/chat-window-style.h
+++ b/lib/chat-window-style.h
@@ -151,6 +151,7 @@ public:
     QString defaultFontFamily() const;
     int defaultFontSize() const;
     bool disableCombineConsecutive() const;
+    int messageViewVersion() const;
 private:
     /**
      * Read style HTML files from disk

-- 
ktp-text-ui packaging