[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=7249ae1

The following commit has been merged in the master branch:
commit 7249ae13191c1c82a7ada45bb6b2dbac623382ad
Author: Dominik Schmidt <ich at dominik-schmidt.de>
Date:   Mon Sep 20 12:49:07 2010 +0000

    Support default style variants correctly.
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1177525
---
 config/mainwindow.cpp   | 5 +----
 lib/chatwindowstyle.cpp | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/config/mainwindow.cpp b/config/mainwindow.cpp
index f3f5635..2f50e1c 100644
--- a/config/mainwindow.cpp
+++ b/config/mainwindow.cpp
@@ -86,10 +86,7 @@ void MainWindow::updateVariantsList()
     QHash<QString, QString> variants = ui->chatView->chatStyle()->getVariants();
     ui->variantComboBox->clear();
     ui->variantComboBox->addItems(variants.keys());
-
-    //FIXME maybe - select the correct one.
-    //ui->variantComboBox->setCurrentItem(currentStyle->getCurrentVariantPath());
-
+    ui->variantComboBox->setCurrentItem(ui->chatView->variantName());
 }
 
 
diff --git a/lib/chatwindowstyle.cpp b/lib/chatwindowstyle.cpp
index 74a37a9..210a289 100644
--- a/lib/chatwindowstyle.cpp
+++ b/lib/chatwindowstyle.cpp
@@ -68,7 +68,6 @@ ChatWindowStyle::ChatWindowStyle(const QString &styleId, StyleBuildMode styleBui
 ChatWindowStyle::ChatWindowStyle(const QString &styleId, const QString &variantPath, StyleBuildMode styleBuildMode)
 	: QObject(), d(new Private)
 {
-    d->currentVariantPath = variantPath;
     init(styleId, styleBuildMode);
 }
 

-- 
ktp-text-ui packaging