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

The following commit has been merged in the master branch:
commit d73f480165d2d6d23926e096e3ace63fd6d962a6
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Mon Aug 3 13:18:55 2009 +0000

    Make Add Account Assistant use OptionalEditParameterWidget and MandatoryEditParameterWidget instead of just ParameterEditWidget in the generic UI, so that validationParameterValues() works correctly.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1006314
---
 src/add-account-assistant.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index d9d143f..0be66cc 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -21,7 +21,8 @@
 #include "add-account-assistant.h"
 
 #include "connection-manager-item.h"
-#include "parameter-edit-widget.h"
+#include "mandatory-parameter-edit-widget.h"
+#include "optional-parameter-edit-widget.h"
 #include "plugin-manager.h"
 #include "protocol-item.h"
 #include "protocol-select-widget.h"
@@ -170,7 +171,7 @@ void AddAccountAssistant::next()
             }
 
             if (!d->mandatoryParametersWidget) {
-                d->mandatoryParametersWidget = new ParameterEditWidget(item->mandatoryParameters(), d->tabWidget);
+                d->mandatoryParametersWidget = new MandatoryParameterEditWidget(item->mandatoryParameters(), d->tabWidget);
             }
 
             d->tabWidget->addTab(d->mandatoryParametersWidget, i18n("Mandatory Parameters"));
@@ -208,9 +209,10 @@ void AddAccountAssistant::next()
 
             // Show the generic UI if optionalParameters is not empty.
             if (optionalParametersLeft.size() > 0) {
-                ParameterEditWidget *pew = new ParameterEditWidget(optionalParametersLeft, d->tabWidget);
-                d->optionalParametersWidgets.append(pew);
-                d->tabWidget->addTab(pew, i18n("Optional Parameters"));
+                OptionalParameterEditWidget *opew =
+                        new OptionalParameterEditWidget(optionalParametersLeft, d->tabWidget);
+                d->optionalParametersWidgets.append(opew);
+                d->tabWidget->addTab(opew, i18n("Optional Parameters"));
             }
 
             KAssistantDialog::next();

-- 
ktp-accounts-kcm packaging