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

The following commit has been merged in the master branch:
commit ccf34be6910d3ecc39a9646defcb42bc1c46c25e
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Jun 23 02:39:01 2011 +0100

    Only fall back to generic interface if a mandatory parameter is missing (not just any parameter)
---
 src/KCMTelepathyAccounts/account-edit-widget.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/KCMTelepathyAccounts/account-edit-widget.cpp b/src/KCMTelepathyAccounts/account-edit-widget.cpp
index 5a26237..0d7ab44 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/account-edit-widget.cpp
@@ -169,17 +169,14 @@ void AccountEditWidget::loadWidgets()
                     paramFound = true;
                 }
             }
-            if (!paramFound)
-                 break;
-
             ++paramIter;
         }
 
-        // if a parameter is missing or a mandatory parameter is not being handled,
+        // if a mandatory parameter is not being handled,
         // fall back to the generic interface.
         // FIXME: not sure this is the best way to handle the situation, but
         //        it is like this in a hope the case won't happen often
-        if (!paramFound || !mandatoryParameters.isEmpty()) {
+        if (!mandatoryParameters.isEmpty()) {
             delete d->mainOptionsWidget;
             d->mainOptionsWidget = 0;
         }

-- 
ktp-accounts-kcm packaging