[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=74c31e4

The following commit has been merged in the master branch:
commit 74c31e4ca14e22e43f148b95c8ac7d98f37ec431
Author: Florian Reinhard <florian.reinhard at googlemail.com>
Date:   Wed Mar 16 02:04:36 2011 +0100

    Don't crash when there's a chatStyle with no variants.
    
    REVIEW: 100870
    BUG: 268503
---
 lib/adium-theme-view.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index 94e8525..0133f3d 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -66,8 +66,10 @@ AdiumThemeView::AdiumThemeView(QWidget *parent)
     if(!variant.isEmpty()) {
         m_variantPath = QString("Variants/%1.css").arg(variant);
         m_variantName = variant;
-    } else {
-        if(m_chatStyle->getVariants().contains(m_chatStyle->defaultVariantName())) {
+
+    // keep m_variantPath, m_variantName empty if there is no variant
+    } else if (!m_chatStyle->getVariants().isEmpty()) {
+        if (m_chatStyle->getVariants().contains(m_chatStyle->defaultVariantName())) {
             m_variantPath = QString("Variants/%1.css").arg(m_chatStyle->defaultVariantName());
             m_variantName = m_chatStyle->defaultVariantName();
         } else {
@@ -78,7 +80,6 @@ AdiumThemeView::AdiumThemeView(QWidget *parent)
 
     m_displayHeader = appearanceConfig.readEntry("displayHeader", false);
 
-
     //special HTML debug mode. Debugging/Profiling only (or theme creating) should have no visible way to turn this flag on.
     m_webInspector = appearanceConfig.readEntry("debug", false);
 

-- 
ktp-text-ui packaging