[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=52aa6f0

The following commit has been merged in the master branch:
commit 52aa6f04b0367581ae2f32180d6635a60057ef62
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Thu May 21 15:08:44 2015 +0200

    Request credentials for password auth type from password auth operation
---
 x-telepathy-password-auth-operation.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/x-telepathy-password-auth-operation.cpp b/x-telepathy-password-auth-operation.cpp
index 89ce040..dfbd0ff 100644
--- a/x-telepathy-password-auth-operation.cpp
+++ b/x-telepathy-password-auth-operation.cpp
@@ -72,8 +72,8 @@ void XTelepathyPasswordAuthOperation::onSASLStatusChanged(uint status, const QSt
         // if we have non-null id AND if the last attempt didn't fail,
         // proceed with the credentials receieved from the SSO;
         // otherwise prompt the user
-        if (m_kaccountsId != 0 && !m_lastLoginFailedConfig.hasKey(m_account->objectPath())) {
-            GetCredentialsJob *credentialsJob = new GetCredentialsJob(m_kaccountsId, this);
+        if (!m_lastLoginFailedConfig.hasKey(m_account->objectPath())) {
+            GetCredentialsJob *credentialsJob = new GetCredentialsJob(m_accountStorageId, QStringLiteral("password"), QStringLiteral("password"), this);
             connect(credentialsJob, &GetCredentialsJob::finished, [this](KJob *job){
                 if (job->error()) {
                     qWarning() << "Credentials job error:" << job->errorText();
@@ -172,7 +172,7 @@ void XTelepathyPasswordAuthOperation::storeCredentials(const QString &secret)
 {
     QString username = m_account->parameters().value(QStringLiteral("account")).toString();
     Accounts::Manager *manager = KAccounts::accountsManager();
-    Accounts::Account *account = manager->account(m_kaccountsId);
+    Accounts::Account *account = manager->account(m_accountStorageId);
     SignOn::Identity *identity;
 
     if (account) {

-- 
ktp-auth-handler packaging