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

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

    Bring up to date with latest libkcmtelepathyaccounts API, and make the gabble mandatory parameters widget support editing.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm-plugins/; revision=1006358
---
 gabble/gabble-account-ui.cpp           | 11 ++++++++---
 gabble/gabble-account-ui.h             |  6 ++++--
 gabble/mandatory-parameters-widget.cpp | 16 +++++++++++++++-
 gabble/mandatory-parameters-widget.h   |  1 +
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/gabble/gabble-account-ui.cpp b/gabble/gabble-account-ui.cpp
index d290996..351e5ee 100644
--- a/gabble/gabble-account-ui.cpp
+++ b/gabble/gabble-account-ui.cpp
@@ -53,19 +53,24 @@ GabbleAccountUi::~GabbleAccountUi()
     delete d;
 }
 
-AbstractAccountParametersWidget *GabbleAccountUi::mandatoryParametersWidget(Tp::ProtocolParameterList parameters) const
+AbstractAccountParametersWidget *GabbleAccountUi::mandatoryParametersWidget(
+        Tp::ProtocolParameterList parameters,
+        const QVariantMap &values) const
 {
     kDebug();
 
-    return new MandatoryParametersWidget(parameters);
+    return new MandatoryParametersWidget(parameters, values);
 }
 
-QList<AbstractAccountParametersWidget*> GabbleAccountUi::optionalParametersWidgets(Tp::ProtocolParameterList parameters) const
+QList<AbstractAccountParametersWidget*> GabbleAccountUi::optionalParametersWidgets(
+        Tp::ProtocolParameterList parameters,
+        const QVariantMap &values) const
 {
     kDebug();
 
     // TODO: Implement me!
     Q_UNUSED(parameters);
+    Q_UNUSED(values);
     return QList<AbstractAccountParametersWidget*>();
 }
 
diff --git a/gabble/gabble-account-ui.h b/gabble/gabble-account-ui.h
index 8de914c..b04b55c 100644
--- a/gabble/gabble-account-ui.h
+++ b/gabble/gabble-account-ui.h
@@ -32,9 +32,11 @@ public:
     virtual ~GabbleAccountUi();
 
     virtual AbstractAccountParametersWidget
-              *mandatoryParametersWidget(Tp::ProtocolParameterList parameters) const;
+              *mandatoryParametersWidget(Tp::ProtocolParameterList parameters,
+                                         const QVariantMap &values = QVariantMap()) const;
     virtual QList<AbstractAccountParametersWidget*>
-              optionalParametersWidgets(Tp::ProtocolParameterList parameters) const;
+              optionalParametersWidgets(Tp::ProtocolParameterList parameters,
+                                        const QVariantMap &values = QVariantMap()) const;
 
 private:
     Q_DISABLE_COPY(GabbleAccountUi);
diff --git a/gabble/mandatory-parameters-widget.cpp b/gabble/mandatory-parameters-widget.cpp
index e29fb29..6b74178 100644
--- a/gabble/mandatory-parameters-widget.cpp
+++ b/gabble/mandatory-parameters-widget.cpp
@@ -44,8 +44,9 @@ public:
 };
 
 MandatoryParametersWidget::MandatoryParametersWidget(Tp::ProtocolParameterList parameters,
+                                                     const QVariantMap &values,
                                                      QWidget *parent)
- : AbstractAccountParametersWidget(parameters, parent),
+ : AbstractAccountParametersWidget(parameters, values, parent),
    d(new Private)
 {
     kDebug();
@@ -70,6 +71,19 @@ MandatoryParametersWidget::MandatoryParametersWidget(Tp::ProtocolParameterList p
     d->ui = new Ui::MandatoryParametersWidget;
     d->ui->setupUi(this);
 
+    // Prefill UI elements if appropriate.
+    if (d->accountParameter) {
+        if (values.contains(d->accountParameter->name())) {
+            d->ui->accountLineEdit->setText(values.value(d->accountParameter->name()).toString());
+        }
+    }
+
+    if (d->passwordParameter) {
+        if (values.contains(d->passwordParameter->name())) {
+            d->ui->passwordLineEdit->setText(values.value(d->passwordParameter->name()).toString());
+        }
+    }
+
     // Hide any elements we don't have the parameters passed to show.
     if (!d->accountParameter) {
         d->ui->accountLabel->hide();
diff --git a/gabble/mandatory-parameters-widget.h b/gabble/mandatory-parameters-widget.h
index 4af3e28..321fe9f 100644
--- a/gabble/mandatory-parameters-widget.h
+++ b/gabble/mandatory-parameters-widget.h
@@ -29,6 +29,7 @@ class MandatoryParametersWidget : public AbstractAccountParametersWidget
 
 public:
     explicit MandatoryParametersWidget(Tp::ProtocolParameterList parameters,
+                                       const QVariantMap &values = QVariantMap(),
                                        QWidget *parent = 0);
     virtual ~MandatoryParametersWidget();
 

-- 
ktp-accounts-kcm packaging