[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=34e2ba5

The following commit has been merged in the master branch:
commit 34e2ba550a3d7dde5389acdc958ba3cb9ffed7bb
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Mar 21 01:08:35 2012 +0100

    Import main.css only for themes with using messageViewVersion > 3
---
 lib/adium-theme-view.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index 68c5d4c..6766cb6 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -136,7 +136,8 @@ void AdiumThemeView::initialise(const AdiumThemeHeaderInfo &chatInfo)
     QString headerHtml;
     QString templateHtml = m_chatStyle->getTemplateHtml();
     QString footerHtml = replaceHeaderKeywords(m_chatStyle->getFooterHtml(), chatInfo);
-    QString extraStyleHtml = QLatin1String("@import url( \"main.css\" );");
+    QString extraStyleHtml = m_chatStyle->messageViewVersion() < 3 ? QLatin1String("")
+                                                                   : QLatin1String("@import url( \"main.css\" );");
     m_lastContent = AdiumThemeContentInfo();
 
     if (templateHtml.isEmpty()) {

-- 
ktp-text-ui packaging