[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=50dbc34

The following commit has been merged in the master branch:
commit 50dbc34b774317380e0d13b7a96c4a0d158e843d
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Thu Jul 29 17:17:28 2010 +0000

    Hack around the password-now-optional change in gabble - this will be fixed properly when I finish my refactoring branch of the kcm
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1156780
---
 src/add-account-assistant.cpp | 25 +++++++++++++++++++++----
 src/edit-account-dialog.cpp   |  4 ++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index 15fa951..16a323d 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -148,6 +148,27 @@ void AddAccountAssistant::next()
         Tp::ProtocolParameterList mandatoryParameters = item->mandatoryParameters();
         Tp::ProtocolParameterList mandatoryParametersLeft = item->mandatoryParameters();
 
+        // Get the list of optional parameters for later
+        Tp::ProtocolParameterList optionalParameters = item->optionalParameters();
+        Tp::ProtocolParameterList optionalParametersLeft = item->optionalParameters();
+
+        // HACK: Hack round gabble making password optional (FIXME once we sort out the plugin system)
+        Tp::ProtocolParameter *passwordParameter = 0;
+
+        foreach (Tp::ProtocolParameter *oP, optionalParameters) {
+            if (oP->name() == "password") {
+                passwordParameter = oP;
+            }
+        }
+
+        // If the password parameter is optional, add it to the mandatory lot for now instead.
+        optionalParameters.removeAll(passwordParameter);
+        optionalParametersLeft.removeAll(passwordParameter);
+        mandatoryParameters.append(passwordParameter);
+        mandatoryParametersLeft.append(passwordParameter);
+
+        // HACK ends
+
         // Create the custom UI or generic UI depending on available parameters.
         if (ui) {
             // UI does exist, set it up.
@@ -188,10 +209,6 @@ void AddAccountAssistant::next()
 		else
 			d->tabWidget->addTab(d->mandatoryParametersWidget, d->mandatoryPageDesc);
 
-        // Get the list of parameters
-        Tp::ProtocolParameterList optionalParameters = item->optionalParameters();
-        Tp::ProtocolParameterList optionalParametersLeft = item->optionalParameters();
-
 		int pageIndex = 0;
 
         // Check if the AbstractAccountUi exists. If not then we use the autogenerated UI for
diff --git a/src/edit-account-dialog.cpp b/src/edit-account-dialog.cpp
index 350c16f..7c55553 100644
--- a/src/edit-account-dialog.cpp
+++ b/src/edit-account-dialog.cpp
@@ -224,6 +224,10 @@ void EditAccountDialog::onTitleForCustomPages(QString mandatoryPageDesc, QList<Q
     foreach (Tp::ProtocolParameter *parameter, protocolParameters) {
         if (parameter->isRequired()) {
             d->mandatoryProtocolParameters.append(parameter);
+        // HACK Work around the password now optional in gabble issue
+        } else if (parameter->name() == "password") {
+            d->mandatoryProtocolParameters.append(parameter);
+        // HACK ends
         } else {
             d->optionalProtocolParameters.append(parameter);
         }

-- 
ktp-accounts-kcm packaging