[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=9c5062d

The following commit has been merged in the master branch:
commit 9c5062d82064b7933edc2678dc6e46e591f7c291
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Thu May 21 15:10:11 2015 +0200

    Handle Tp::SASLStatusServerFailed in Google auth operation
---
 x-telepathy-sso-google-operation.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/x-telepathy-sso-google-operation.cpp b/x-telepathy-sso-google-operation.cpp
index 1f6b7e6..2821659 100644
--- a/x-telepathy-sso-google-operation.cpp
+++ b/x-telepathy-sso-google-operation.cpp
@@ -24,6 +24,7 @@
 
 #include <KSharedConfig>
 #include <KConfigGroup>
+#include <KLocalizedString>
 
 XTelepathySSOGoogleOperation::XTelepathySSOGoogleOperation(const Tp::AccountPtr &account, int accountStorageId, Tp::Client::ChannelInterfaceSASLAuthenticationInterface *saslIface)
     : PendingOperation(account)
@@ -53,6 +54,13 @@ void XTelepathySSOGoogleOperation::onSASLStatusChanged(uint status, const QStrin
         qDebug() << "Authentication succeeded";
         setFinished();
         break;
+    case Tp::SASLStatusServerFailed:
+        qDebug() << "Auth failed";
+        QString errorMessage = details[QLatin1String("server-message")].toString();
+        if (errorMessage.isEmpty()) {
+            errorMessage = details[QLatin1String("debug-message")].toString();
+        }
+        setFinishedWithError(reason, errorMessage.isEmpty() ? i18n("Authentication error") : errorMessage);
     }
 }
 

-- 
ktp-auth-handler packaging