[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=64a8b27

The following commit has been merged in the master branch:
commit 64a8b2712582b199594c99a57bcee11394631798
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Jan 2 18:16:54 2011 +0000

    Typecast port numbers to uint before setting as QVariant.
    Without this the DBus connection complains it is receiving the wrong
    type.
---
 gabble/proxy-settings-widget.cpp  | 6 +++---
 gabble/server-settings-widget.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gabble/proxy-settings-widget.cpp b/gabble/proxy-settings-widget.cpp
index 48eadd7..a8633e7 100644
--- a/gabble/proxy-settings-widget.cpp
+++ b/gabble/proxy-settings-widget.cpp
@@ -246,7 +246,7 @@ QVariantMap ProxySettingsWidget::parameterValues() const
     }
 
     if (d->stunPortParameter.isValid()) {
-        parameters.insert(d->stunPortParameter.name(), d->ui->stunPortSpinBox->value());
+        parameters.insert(d->stunPortParameter.name(), (uint)d->ui->stunPortSpinBox->value());
     }
 
     if (d->fallbackStunServerParameter.isValid()) {
@@ -255,7 +255,7 @@ QVariantMap ProxySettingsWidget::parameterValues() const
     }
 
     if (d->fallbackStunPortParameter.isValid()) {
-        parameters.insert(d->fallbackStunPortParameter.name(), d->ui->fallbackStunPortSpinBox->value());
+        parameters.insert(d->fallbackStunPortParameter.name(), (uint)d->ui->fallbackStunPortSpinBox->value());
     }
 
     if (d->httpsProxyServerParameter.isValid()) {
@@ -263,7 +263,7 @@ QVariantMap ProxySettingsWidget::parameterValues() const
     }
 
     if (d->httpsProxyPortParameter.isValid()) {
-        parameters.insert(d->httpsProxyPortParameter.name(), d->ui->httpsProxyPortSpinBox->value());
+        parameters.insert(d->httpsProxyPortParameter.name(), (uint)d->ui->httpsProxyPortSpinBox->value());
     }
 
     if (d->fallbackSocks5ProxiesParameter.isValid()) {
diff --git a/gabble/server-settings-widget.cpp b/gabble/server-settings-widget.cpp
index b58b95a..709180c 100644
--- a/gabble/server-settings-widget.cpp
+++ b/gabble/server-settings-widget.cpp
@@ -208,11 +208,11 @@ QVariantMap ServerSettingsWidget::parameterValues() const
     }
 
     if (d->portParameter.isValid()) {
-        parameters.insert(d->portParameter.name(), d->ui->portSpinBox->value());
+        parameters.insert(d->portParameter.name(), (uint)d->ui->portSpinBox->value());
     }
 
     if (d->keepaliveIntervalParameter.isValid()) {
-        parameters.insert(d->keepaliveIntervalParameter.name(), d->ui->keepaliveIntervalSpinBox->value());
+        parameters.insert(d->keepaliveIntervalParameter.name(), (uint)d->ui->keepaliveIntervalSpinBox->value());
     }
 
     if (d->lowBandwidthParameter.isValid()) {

-- 
ktp-accounts-kcm packaging