[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=0f34c6d

The following commit has been merged in the master branch:
commit 0f34c6d29e78683ae8180cc4d8aa09e5eded8ef9
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Wed Sep 22 14:24:05 2010 +0000

    Hack the Hack to make it not crash when using a CM where password is mandatory.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1178250
---
 src/add-account-assistant.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index 79db39b..b02b455 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -162,10 +162,12 @@ void AddAccountAssistant::next()
         }
 
         // 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);
+        if (passwordParameter) {
+            optionalParameters.removeAll(passwordParameter);
+            optionalParametersLeft.removeAll(passwordParameter);
+            mandatoryParameters.append(passwordParameter);
+            mandatoryParametersLeft.append(passwordParameter);
+        }
 
         // HACK ends
 

-- 
ktp-accounts-kcm packaging