[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=42e9193

The following commit has been merged in the master branch:
commit 42e919326ee0e3ecb2f0815f42bc28fb7925bc78
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Mon Jun 11 13:30:56 2012 +0300

    AbstractAccountParametersWidget: Map the "currentText" property of QComboBox if the parameter requires a string type
---
 src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
index b61e836..9ecd76d 100644
--- a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
+++ b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
@@ -124,6 +124,8 @@ void AbstractAccountParametersWidget::handleParameter(const QString &parameterNa
         //for text edit boxes we force it to use the plainText property so that we don't get HTML all over our options
         if (dataWidget->inherits("QTextEdit")) {
             d->mapper->addMapping(dataWidget, index.row(), "plainText");
+        } else if (dataWidget->inherits("QComboBox") && parameterType == QVariant::String) {
+            d->mapper->addMapping(dataWidget, index.row(), "currentText");
         } else {
             d->mapper->addMapping(dataWidget, index.row());
         }

-- 
ktp-accounts-kcm packaging