[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=2e89d59

The following commit has been merged in the master branch:
commit 2e89d5915678b3449d67e198c05354a9df9b4752
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Oct 27 02:55:59 2011 +0200

    Request again to connect if canTryAgain is false
    
    We cannot try again, but we can request again to set the account online.
    A new channel will be created, but since we set the lastLoginFailed
    entry, next time we will prompt for password and the user won't see any
    difference except for an authentication error notification
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
---
 sasl-auth-op.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sasl-auth-op.cpp b/sasl-auth-op.cpp
index 27c648d..e081d03 100644
--- a/sasl-auth-op.cpp
+++ b/sasl-auth-op.cpp
@@ -110,8 +110,16 @@ void SaslAuthOp::onSASLStatusChanged(uint status, const QString &reason,
         } else {
             kWarning() << "Authentication failed and cannot try again";
             wallet.setEntry(m_account, QLatin1String("lastLoginFailed"), QLatin1String("true"));
+            // We cannot try again, but we can request again to set the account
+            // online. A new channel will be created, but since we set the
+            // lastLoginFailed entry, next time we will prompt for password
+            // and the user won't see any difference except for an
+            // authentication error notification
+            Tp::Presence requestedPresence = m_account->requestedPresence();
             m_channel->requestClose();
             QString errorMessage = details[QLatin1String("server-message")].toString();
+            m_account->setRequestedPresence(requestedPresence);
+
             setFinishedWithError(reason, errorMessage.isEmpty() ? i18n("Authentication error") : errorMessage);
         }
     }

-- 
ktp-auth-handler packaging