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

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

    Rely on the AbstractAccountParametersWidget classes to validate their parameter values.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1006308
---
 src/add-account-assistant.cpp | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index 4e6e7f7..d9d143f 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -228,17 +228,22 @@ void AddAccountAssistant::accept()
         return;
     }
 
-    // Get the mandatory parameters.
-    QMap<Tp::ProtocolParameter*, QVariant> mandatoryParameterValues;
-    mandatoryParameterValues = d->mandatoryParametersWidget->parameterValues();
+    // Check all pages of parameters pass validation.
+    if (!d->mandatoryParametersWidget->validateParameterValues()) {
+        kDebug() << "A widget failed parameter validation. Not accepting wizard.";
+        return;
+    }
 
-    foreach (const QVariant &value, mandatoryParameterValues.values()) {
-        if (value.toString().isEmpty()) {
-            KMessageBox::error(this, i18n("Please enter all mandatory parameters."));
+    foreach (AbstractAccountParametersWidget *w, d->optionalParametersWidgets) {
+        if (!w->validateParameterValues()) {
+            kDebug() << "A widget failed parameter validation. Not accepting wizard.";
             return;
         }
     }
 
+    // Get the mandatory parameters.
+    QMap<Tp::ProtocolParameter*, QVariant> mandatoryParameterValues;
+    mandatoryParameterValues = d->mandatoryParametersWidget->parameterValues();
 
     // Get the optional properties
     QMap<Tp::ProtocolParameter*, QVariant> optionalParameterValues;
@@ -313,6 +318,7 @@ void AddAccountAssistant::reject()
 void AddAccountAssistant::onAccountCreated(Tp::PendingOperation *op)
 {
     if (op->isError()) {
+        // TODO: User feedback in this case.
         kWarning() << "Adding Account failed:" << op->errorName() << op->errorMessage();
         return;
     }
@@ -320,3 +326,6 @@ void AddAccountAssistant::onAccountCreated(Tp::PendingOperation *op)
     KAssistantDialog::accept();
 }
 
+
+#include "add-account-assistant.moc"
+

-- 
ktp-accounts-kcm packaging