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

The following commit has been merged in the master branch:
commit b361f26764e566a0c13199007b43bfd8913752e7
Author: Dominik Schmidt <ich at dominik-schmidt.de>
Date:   Sun Oct 3 16:03:09 2010 +0000

    Fix loading styles with broken defaultVariants.
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1182166
---
 lib/adiumthemeview.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/adiumthemeview.cpp b/lib/adiumthemeview.cpp
index bfab80f..27e61c3 100644
--- a/lib/adiumthemeview.cpp
+++ b/lib/adiumthemeview.cpp
@@ -63,9 +63,15 @@ AdiumThemeView::AdiumThemeView(QWidget *parent) :
         m_variantPath = QString("Variants/%1.css").arg(variant);
         m_variantName = variant;
     } else {
-        m_variantPath = QString("Variants/%1.css").arg(m_chatStyle->defaultVariantName());
-        m_variantName = m_chatStyle->defaultVariantName();
+        if(m_chatStyle->getVariants().contains(m_chatStyle->defaultVariantName())) {
+            m_variantPath = QString("Variants/%1.css").arg(m_chatStyle->defaultVariantName());
+            m_variantName = m_chatStyle->defaultVariantName();
+        } else {
+            m_variantPath = QString("Variants/%1.css").arg(m_chatStyle->getVariants().keys().first());
+            m_variantName = m_chatStyle->getVariants().keys().first();
+        }
     }
+
     m_displayHeader = appearanceConfig.readEntry("displayHeader", false);
 
 
@@ -169,12 +175,13 @@ void AdiumThemeView::setChatStyle(ChatWindowStyle *chatStyle)
 
     //load the first variant
     QHash<QString, QString> variants = chatStyle->getVariants();
-    if(!chatStyle->defaultVariantName().isEmpty()) {
+    if(!chatStyle->defaultVariantName().isEmpty()
+            && variants.keys().contains(chatStyle->defaultVariantName())) {
         m_variantPath = variants.value(chatStyle->defaultVariantName());
         m_variantName = chatStyle->defaultVariantName();
     } else if (variants.keys().length() > 0) {
-        m_variantPath = variants.values()[0];
-        m_variantName = variants.keys()[0];
+        m_variantPath = variants.values().first();
+        m_variantName = variants.keys().first();
     } else {
         m_variantPath = "";
         m_variantName = "";

-- 
ktp-text-ui packaging