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

The following commit has been merged in the master branch:
commit be6101e57aaa1af692763a39f1b1320a38acf664
Author: Francesco Nwokeka <francesco.nwokeka at gmail.com>
Date:   Wed Oct 26 19:41:48 2011 +0200

    FIX empty account facebook bug
    
    This bug let users add a facebook account without "account" and "password" fields
    BUG: 279110
    REVIEW: 102972
    Reviewed By: David Edmundson
---
 plugins/gabble/main-options-widget-facebook.cpp | 10 ++++++++++
 plugins/gabble/main-options-widget-facebook.h   |  1 +
 src/add-account-assistant.cpp                   |  3 +++
 3 files changed, 14 insertions(+)

diff --git a/plugins/gabble/main-options-widget-facebook.cpp b/plugins/gabble/main-options-widget-facebook.cpp
index 7f6ef22..6b4e80d 100644
--- a/plugins/gabble/main-options-widget-facebook.cpp
+++ b/plugins/gabble/main-options-widget-facebook.cpp
@@ -75,5 +75,15 @@ void MainOptionsWidgetFacebook::submit()
     AbstractAccountParametersWidget::submit();
 }
 
+bool MainOptionsWidgetFacebook::validateParameterValues()
+{
+    if (m_ui->accountLineEdit->text().isEmpty() || m_ui->passwordLineEdit->text().isEmpty()) {
+        return false;
+    }
+
+    return true;
+}
+
+
 #include "main-options-widget-facebook.moc"
 
diff --git a/plugins/gabble/main-options-widget-facebook.h b/plugins/gabble/main-options-widget-facebook.h
index 0f5f42f..4653b73 100644
--- a/plugins/gabble/main-options-widget-facebook.h
+++ b/plugins/gabble/main-options-widget-facebook.h
@@ -36,6 +36,7 @@ public:
     virtual ~MainOptionsWidgetFacebook();
 
     virtual void submit();
+    bool validateParameterValues();
 
 private:
     Ui::MainOptionsWidgetFacebook *m_ui;
diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index 3614cc6..59108e5 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -153,6 +153,9 @@ void AddAccountAssistant::accept()
     // Check all pages of parameters pass validation.
     if (!d->accountEditWidget->validateParameterValues()) {
         kDebug() << "A widget failed parameter validation. Not accepting wizard.";
+        Q_EMIT feedbackMessage(i18n("Failed to create account"),
+                               i18n("All mandatory fields must be filled"),
+                               KTitleWidget::InfoMessage);
         return;
     }
 

-- 
ktp-accounts-kcm packaging