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

The following commit has been merged in the master branch:
commit c45bd696ff6f71d6ebcd7341c79d132d79f4b198
Author: Daniele E. Domenichelli <ddomenichelli at kde.org>
Date:   Fri Mar 8 10:28:13 2013 +0100

    Fix loading default variant when using main.css
    
    This fixes, for example, Zelda (OoT)vrs 2 Adium Message Style
    http://www.adiumxtras.com/index.php?a=xtras&xtra_id=3544
    that is displayed correctly from the kcm, but displayed wrong
    when used in the chat ui.
---
 lib/adium-theme-view.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index 929e325..49aa73a 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -94,8 +94,8 @@ void AdiumThemeView::load(ChatType chatType) {
 
     QString variant = appearanceConfig.readEntry("styleVariant");
     if (!variant.isEmpty()) {
-        m_variantPath = QString(QLatin1String("Variants/%1.css")).arg(variant);
         m_variantName = variant;
+        m_variantPath = m_chatStyle->getVariants().value(variant);
 
         // keep m_variantPath, m_variantName empty if there is no variant
     } else if (!m_chatStyle->getVariants().isEmpty()) {

-- 
ktp-text-ui packaging