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

The following commit has been merged in the master branch:
commit e2e08fc21ff30c010dfe4b7053029e32344fdba1
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Mon Sep 14 09:05:32 2009 +0000

    Use new validation support on int and uint entry fields.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm-plugins/; revision=1023215
---
 gabble/proxy-settings-widget.cpp  | 21 +++++++++++++++++++++
 gabble/server-settings-widget.cpp | 14 ++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/gabble/proxy-settings-widget.cpp b/gabble/proxy-settings-widget.cpp
index b0789d3..06b6990 100644
--- a/gabble/proxy-settings-widget.cpp
+++ b/gabble/proxy-settings-widget.cpp
@@ -312,6 +312,27 @@ bool ProxySettingsWidget::validateParameterValues()
 {
     kDebug();
 
+    // Validate all the int's and uint's.
+    if (d->ui->stunPortLineEdit->validity() != QValidator::Acceptable) {
+        KMessageBox::error(this,
+                              i18n("\"<b>%1</b>\" is not an acceptable value for <b>%2</b>")
+                              .arg(d->ui->stunPortLineEdit->text())
+                              .arg(d->ui->stunPortLabel->text()));
+        return false;
+    } else if (d->ui->fallbackStunPortLineEdit->validity() != QValidator::Acceptable) {
+        KMessageBox::error(this,
+                              i18n("\"<b>%1</b>\" is not an acceptable value for <b>%2</b>")
+                              .arg(d->ui->fallbackStunPortLineEdit->text())
+                              .arg(d->ui->fallbackStunPortLabel->text()));
+        return false;
+    } else if (d->ui->httpsProxyPortLineEdit->validity() != QValidator::Acceptable) {
+        KMessageBox::error(this,
+                              i18n("\"<b>%1</b>\" is not an acceptable value for <b>%2</b>")
+                              .arg(d->ui->httpsProxyPortLineEdit->text())
+                              .arg(d->ui->httpsProxyPortLabel->text()));
+        return false;
+    }
+
     return true;
 }
 
diff --git a/gabble/server-settings-widget.cpp b/gabble/server-settings-widget.cpp
index 1fbf522..15cff02 100644
--- a/gabble/server-settings-widget.cpp
+++ b/gabble/server-settings-widget.cpp
@@ -264,6 +264,20 @@ bool ServerSettingsWidget::validateParameterValues()
 {
     kDebug();
 
+    if (d->ui->portLineEdit->validity() != QValidator::Acceptable) {
+        KMessageBox::error(this,
+                              i18n("\"<b>%1</b>\" is not an acceptable value for <b>%2</b>")
+                              .arg(d->ui->portLineEdit->text())
+                              .arg(d->ui->portLabel->text()));
+        return false;
+    } else if (d->ui->keepaliveIntervalLineEdit->validity() != QValidator::Acceptable) {
+        KMessageBox::error(this,
+                              i18n("\"<b>%1</b>\" is not an acceptable value for <b>%2</b>")
+                              .arg(d->ui->keepaliveIntervalLineEdit->text())
+                              .arg(d->ui->keepaliveIntervalLabel->text()));
+        return false;
+    }
+
     return true;
 }
 

-- 
ktp-accounts-kcm packaging