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

The following commit has been merged in the master branch:
commit aa373572f232346906418300a85ac67f60c745e1
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Mon Aug 10 16:44:56 2009 +0000

    If no value is provided for a given parameter, set the widget to show its default value.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm-plugins/; revision=1009701
---
 gabble/mandatory-parameters-widget.cpp |  4 ++++
 gabble/proxy-settings-widget.cpp       | 24 ++++++++++++++++++++++++
 gabble/server-settings-widget.cpp      | 18 ++++++++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/gabble/mandatory-parameters-widget.cpp b/gabble/mandatory-parameters-widget.cpp
index 85a2cc7..47aa4a6 100644
--- a/gabble/mandatory-parameters-widget.cpp
+++ b/gabble/mandatory-parameters-widget.cpp
@@ -75,12 +75,16 @@ MandatoryParametersWidget::MandatoryParametersWidget(Tp::ProtocolParameterList p
     if (d->accountParameter) {
         if (values.contains(d->accountParameter->name())) {
             d->ui->accountLineEdit->setText(values.value(d->accountParameter->name()).toString());
+        } else {
+            d->ui->accountLineEdit->setText(d->accountParameter->defaultValue().toString());
         }
     }
 
     if (d->passwordParameter) {
         if (values.contains(d->passwordParameter->name())) {
             d->ui->passwordLineEdit->setText(values.value(d->passwordParameter->name()).toString());
+        } else {
+            d->ui->passwordLineEdit->setText(d->passwordParameter->defaultValue().toString());
         }
     }
 
diff --git a/gabble/proxy-settings-widget.cpp b/gabble/proxy-settings-widget.cpp
index 959c86e..19c563e 100644
--- a/gabble/proxy-settings-widget.cpp
+++ b/gabble/proxy-settings-widget.cpp
@@ -118,12 +118,16 @@ ProxySettingsWidget::ProxySettingsWidget(Tp::ProtocolParameterList parameters,
         if (values.contains(d->stunServerParameter->name())) {
             d->ui->stunServerLineEdit->setText(values.value(
                     d->stunServerParameter->name()).toString());
+        } else {
+            d->ui->stunServerLineEdit->setText(d->stunServerParameter->defaultValue().toString());
         }
     }
 
     if (d->stunPortParameter) {
         if (values.contains(d->stunPortParameter->name())) {
             d->ui->stunPortLineEdit->setValue(values.value(d->stunPortParameter->name()).toUInt());
+        } else {
+            d->ui->stunPortLineEdit->setValue(d->stunPortParameter->defaultValue().toUInt());
         }
     }
 
@@ -131,6 +135,9 @@ ProxySettingsWidget::ProxySettingsWidget(Tp::ProtocolParameterList parameters,
         if (values.contains(d->fallbackStunServerParameter->name())) {
             d->ui->fallbackStunServerLineEdit->setText(values.value(
                     d->fallbackStunServerParameter->name()).toString());
+        } else {
+            d->ui->fallbackStunServerLineEdit->setText(
+                    d->fallbackStunServerParameter->defaultValue().toString());
         }
     }
 
@@ -138,6 +145,9 @@ ProxySettingsWidget::ProxySettingsWidget(Tp::ProtocolParameterList parameters,
         if (values.contains(d->fallbackStunPortParameter->name())) {
             d->ui->fallbackStunPortLineEdit->setValue(values.value(
                     d->fallbackStunPortParameter->name()).toUInt());
+        } else {
+            d->ui->fallbackStunPortLineEdit->setValue(
+                    d->fallbackStunPortParameter->defaultValue().toUInt());
         }
     }
 
@@ -145,6 +155,9 @@ ProxySettingsWidget::ProxySettingsWidget(Tp::ProtocolParameterList parameters,
         if (values.contains(d->httpsProxyServerParameter->name())) {
             d->ui->httpsProxyServerLineEdit->setText(values.value(
                     d->httpsProxyServerParameter->name()).toString());
+        } else {
+            d->ui->httpsProxyServerLineEdit->setText(
+                    d->httpsProxyServerParameter->defaultValue().toString());
         }
     }
 
@@ -152,6 +165,9 @@ ProxySettingsWidget::ProxySettingsWidget(Tp::ProtocolParameterList parameters,
         if (values.contains(d->httpsProxyPortParameter->name())) {
             d->ui->httpsProxyPortLineEdit->setValue(values.value(
                     d->httpsProxyPortParameter->name()).toUInt());
+        } else {
+            d->ui->httpsProxyPortLineEdit->setValue(
+                    d->httpsProxyServerParameter->defaultValue().toUInt());
         }
     }
 
@@ -161,6 +177,11 @@ ProxySettingsWidget::ProxySettingsWidget(Tp::ProtocolParameterList parameters,
                      values.value(d->fallbackSocks5ProxiesParameter->name()).toStringList()) {
                 d->ui->fallbackSocks5ProxiesTextEdit->append(line);
             }
+        } else {
+            foreach (const QString &line,
+                     d->fallbackSocks5ProxiesParameter->defaultValue().toStringList()) {
+                d->ui->fallbackSocks5ProxiesTextEdit->append(line);
+            }
         }
     }
 
@@ -168,6 +189,9 @@ ProxySettingsWidget::ProxySettingsWidget(Tp::ProtocolParameterList parameters,
         if (values.contains(d->fallbackConferenceServerParameter->name())) {
             d->ui->fallbackConferenceServerLineEdit->setText(values.value(
                     d->fallbackConferenceServerParameter->name()).toString());
+        } else {
+            d->ui->fallbackConferenceServerLineEdit->setText(
+                    d->fallbackConferenceServerParameter->defaultValue().toString());
         }
     }
 
diff --git a/gabble/server-settings-widget.cpp b/gabble/server-settings-widget.cpp
index fa7ca26..1fbf522 100644
--- a/gabble/server-settings-widget.cpp
+++ b/gabble/server-settings-widget.cpp
@@ -105,12 +105,16 @@ ServerSettingsWidget::ServerSettingsWidget(Tp::ProtocolParameterList parameters,
     if (d->serverParameter) {
         if (values.contains(d->serverParameter->name())) {
             d->ui->serverLineEdit->setText(values.value(d->serverParameter->name()).toString());
+        } else {
+            d->ui->serverLineEdit->setText(d->serverParameter->defaultValue().toString());
         }
     }
 
     if (d->portParameter) {
         if (values.contains(d->portParameter->name())) {
             d->ui->portLineEdit->setValue(values.value(d->portParameter->name()).toUInt());
+        } else {
+            d->ui->portLineEdit->setValue(d->portParameter->defaultValue().toUInt());
         }
     }
 
@@ -118,6 +122,9 @@ ServerSettingsWidget::ServerSettingsWidget(Tp::ProtocolParameterList parameters,
         if (values.contains(d->keepaliveIntervalParameter->name())) {
             d->ui->keepaliveIntervalLineEdit->setValue(values.value(
                     d->keepaliveIntervalParameter->name()).toUInt());
+        } else {
+            d->ui->keepaliveIntervalLineEdit->setValue(
+                    d->keepaliveIntervalParameter->defaultValue().toUInt());
         }
     }
 
@@ -125,6 +132,9 @@ ServerSettingsWidget::ServerSettingsWidget(Tp::ProtocolParameterList parameters,
         if (values.contains(d->lowBandwidthParameter->name())) {
             d->ui->lowBandwidthCheckBox->setChecked(values.value(
                     d->lowBandwidthParameter->name()).toBool());
+        } else {
+            d->ui->lowBandwidthCheckBox->setChecked(
+                    d->lowBandwidthParameter->defaultValue().toBool());
         }
     }
 
@@ -132,6 +142,9 @@ ServerSettingsWidget::ServerSettingsWidget(Tp::ProtocolParameterList parameters,
         if (values.contains(d->requireEncryptionParameter->name())) {
             d->ui->requireEncryptionCheckBox->setChecked(values.value(
                     d->requireEncryptionParameter->name()).toBool());
+        } else {
+            d->ui->requireEncryptionCheckBox->setChecked(
+                    d->requireEncryptionParameter->defaultValue().toBool());
         }
     }
 
@@ -139,12 +152,17 @@ ServerSettingsWidget::ServerSettingsWidget(Tp::ProtocolParameterList parameters,
         if (values.contains(d->ignoreSslErrorsParameter->name())) {
             d->ui->ignoreSslErrorsCheckBox->setChecked(values.value(
                     d->ignoreSslErrorsParameter->name()).toBool());
+        } else {
+            d->ui->ignoreSslErrorsCheckBox->setChecked(
+                    d->ignoreSslErrorsParameter->defaultValue().toBool());
         }
     }
 
     if (d->oldSslParameter) {
         if (values.contains(d->oldSslParameter->name())) {
             d->ui->oldSslCheckBox->setChecked(values.value(d->oldSslParameter->name()).toBool());
+        } else {
+            d->ui->oldSslCheckBox->setChecked(d->oldSslParameter->defaultValue().toBool());
         }
     }
 

-- 
ktp-accounts-kcm packaging