[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=07106ed

The following commit has been merged in the master branch:
commit 07106ed459dc6e10f3febbb0859402189aed2fef
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Aug 2 01:50:46 2011 +0100

    Make sure we use plainText from QTextEdit for parameters
    
    REVIEW: 102174
    Reviewed by Martin Klapetek
---
 src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
index c4f96af..d0c469c 100644
--- a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
+++ b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
@@ -116,7 +116,12 @@ void AbstractAccountParametersWidget::handleParameter(const QString &parameterNa
     if(index.isValid()) {
         kDebug() << index << parameterName;
         // insert it to valid parameters list
-        d->mapper->addMapping(dataWidget, index.row());
+        //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 {
+            d->mapper->addMapping(dataWidget, index.row());
+        }
         d->mapper->toFirst();
 
         // check if the passed parameter is a validated one.. If so we're going to set the model here

-- 
ktp-accounts-kcm packaging