[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=668673c

The following commit has been merged in the master branch:
commit 668673cd733ca37ce240d6cabe4ad767ece54614
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Mon Aug 10 13:50:29 2009 +0000

    Add the ServerSettingsWidget to the list of optional widgets the plugin has.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm-plugins/; revision=1009624
---
 gabble/gabble-account-ui.cpp           | 11 +++++++----
 gabble/mandatory-parameters-widget.cpp |  2 ++
 gabble/server-settings-widget.cpp      |  2 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/gabble/gabble-account-ui.cpp b/gabble/gabble-account-ui.cpp
index 42eb447..390fe1f 100644
--- a/gabble/gabble-account-ui.cpp
+++ b/gabble/gabble-account-ui.cpp
@@ -21,6 +21,7 @@
 #include "gabble-account-ui.h"
 
 #include "mandatory-parameters-widget.h"
+#include "server-settings-widget.h"
 
 #include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
 
@@ -76,10 +77,12 @@ QList<AbstractAccountParametersWidget*> GabbleAccountUi::optionalParametersWidge
 {
     kDebug();
 
-    // TODO: Implement me!
-    Q_UNUSED(parameters);
-    Q_UNUSED(values);
-    return QList<AbstractAccountParametersWidget*>();
+    QList<AbstractAccountParametersWidget*> widgets;
+
+    // Add each of the optional parameter widgets.
+    widgets.append(new ServerSettingsWidget(parameters, values));
+
+    return widgets;
 }
 
 
diff --git a/gabble/mandatory-parameters-widget.cpp b/gabble/mandatory-parameters-widget.cpp
index 6b74178..85a2cc7 100644
--- a/gabble/mandatory-parameters-widget.cpp
+++ b/gabble/mandatory-parameters-widget.cpp
@@ -123,6 +123,8 @@ QMap<Tp::ProtocolParameter*, QVariant> MandatoryParametersWidget::parameterValue
 
 bool MandatoryParametersWidget::validateParameterValues()
 {
+    kDebug();
+
     // Check if both the password and account have been entered. If not, alert the user.
     if ((d->ui->passwordLineEdit->text().isEmpty()) ||
         (d->ui->accountLineEdit->text().isEmpty())) {
diff --git a/gabble/server-settings-widget.cpp b/gabble/server-settings-widget.cpp
index 27e9cdf..fa7ca26 100644
--- a/gabble/server-settings-widget.cpp
+++ b/gabble/server-settings-widget.cpp
@@ -244,6 +244,8 @@ QMap<Tp::ProtocolParameter*, QVariant> ServerSettingsWidget::parameterValues() c
 
 bool ServerSettingsWidget::validateParameterValues()
 {
+    kDebug();
+
     return true;
 }
 

-- 
ktp-accounts-kcm packaging