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

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

    Do not make messages consecutive for themes that do not support it
---
 lib/adium-theme-view.cpp  | 2 +-
 lib/chat-window-style.cpp | 7 +++++++
 lib/chat-window-style.h   | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index 406fb2a..e2b6ed8 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -340,7 +340,7 @@ void AdiumThemeView::addContentMessage(const AdiumThemeContentInfo &contentMessa
 
     replaceContentKeywords(styleHtml, message);
 
-    if (consecutiveMessage) {
+    if (consecutiveMessage && !m_chatStyle->disableCombineConsecutive()) {
         appendNextMessage(styleHtml);
     } else {
         appendNewMessage(styleHtml);
diff --git a/lib/chat-window-style.cpp b/lib/chat-window-style.cpp
index 6a30f2b..dc46954 100644
--- a/lib/chat-window-style.cpp
+++ b/lib/chat-window-style.cpp
@@ -40,6 +40,7 @@ public:
     QString defaultVariantName;
     QString defaultFontFamily;
     int     defaultFontSize;
+    bool    disableCombineConsecutive;
 
     QHash<int, QString> templateContents;
     QHash<QString, bool> compactVariants;
@@ -133,6 +134,11 @@ int ChatWindowStyle::defaultFontSize() const
     return d->defaultFontSize;
 }
 
+bool ChatWindowStyle::disableCombineConsecutive() const
+{
+    return d->disableCombineConsecutive;
+}
+
 QString ChatWindowStyle::getStyleBaseHref() const
 {
     return d->baseHref;
@@ -304,6 +310,7 @@ void ChatWindowStyle::readStyleFiles()
     d->defaultVariantName = plistReader.defaultVariant();
     d->defaultFontFamily  = plistReader.defaultFontFamily();
     d->defaultFontSize    = plistReader.defaultFontSize();
+    d->disableCombineConsecutive = plistReader.disableCombineConsecutive();
 
     // specify the files for the identifiers
     QHash<InternalIdentifier, QLatin1String> templateFiles;
diff --git a/lib/chat-window-style.h b/lib/chat-window-style.h
index fd7c34d..3e9fcb9 100644
--- a/lib/chat-window-style.h
+++ b/lib/chat-window-style.h
@@ -147,6 +147,7 @@ public:
     QString defaultVariantName() const;
     QString defaultFontFamily() const;
     int defaultFontSize() const;
+    bool disableCombineConsecutive() const;
 private:
     /**
      * Read style HTML files from disk

-- 
ktp-text-ui packaging