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

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

    Pass the KAccounts ID to XTelepathyPasswordAuthOperation directly
---
 sasl-auth-op.cpp                        | 2 +-
 x-telepathy-password-auth-operation.cpp | 4 +++-
 x-telepathy-password-auth-operation.h   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sasl-auth-op.cpp b/sasl-auth-op.cpp
index a757555..7b465a8 100644
--- a/sasl-auth-op.cpp
+++ b/sasl-auth-op.cpp
@@ -79,7 +79,7 @@ void SaslAuthOp::gotProperties(Tp::PendingOperation *op)
     } else if (mechanisms.contains(QLatin1String("X-TELEPATHY-PASSWORD"))) {
         qDebug() << "Starting Password auth";
         Q_EMIT ready(this);
-        XTelepathyPasswordAuthOperation *authop = new XTelepathyPasswordAuthOperation(m_account, m_saslIface, qdbus_cast<bool>(props.value(QLatin1String("CanTryAgain"))));
+        XTelepathyPasswordAuthOperation *authop = new XTelepathyPasswordAuthOperation(m_account, m_accountStorageId, m_saslIface, qdbus_cast<bool>(props.value(QLatin1String("CanTryAgain"))));
         connect(authop,
                 SIGNAL(finished(Tp::PendingOperation*)),
                 SLOT(onAuthOperationFinished(Tp::PendingOperation*)));
diff --git a/x-telepathy-password-auth-operation.cpp b/x-telepathy-password-auth-operation.cpp
index 0d58578..89ce040 100644
--- a/x-telepathy-password-auth-operation.cpp
+++ b/x-telepathy-password-auth-operation.cpp
@@ -39,13 +39,15 @@
 
 XTelepathyPasswordAuthOperation::XTelepathyPasswordAuthOperation(
         const Tp::AccountPtr &account,
+        int accountStorageId,
         Tp::Client::ChannelInterfaceSASLAuthenticationInterface *saslIface,
         bool canTryAgain) :
     Tp::PendingOperation(account),
     m_account(account),
     m_saslIface(saslIface),
     m_canTryAgain(canTryAgain),
-    m_canFinish(false)
+    m_canFinish(false),
+    m_accountStorageId(accountStorageId)
 {
     connect(m_saslIface,
             SIGNAL(SASLStatusChanged(uint,QString,QVariantMap)),
diff --git a/x-telepathy-password-auth-operation.h b/x-telepathy-password-auth-operation.h
index 52a44d6..5760de2 100644
--- a/x-telepathy-password-auth-operation.h
+++ b/x-telepathy-password-auth-operation.h
@@ -34,6 +34,7 @@ class XTelepathyPasswordAuthOperation : public Tp::PendingOperation
 public:
     explicit XTelepathyPasswordAuthOperation(
             const Tp::AccountPtr &account,
+            int accountStorageId,
             Tp::Client::ChannelInterfaceSASLAuthenticationInterface *saslIface,
             bool canTryAgain);
     ~XTelepathyPasswordAuthOperation();
@@ -50,7 +51,7 @@ private:
     Tp::Client::ChannelInterfaceSASLAuthenticationInterface *m_saslIface;
     KSharedConfigPtr m_config;
     KConfigGroup m_lastLoginFailedConfig;
-    quint32 m_kaccountsId;
+    int m_accountStorageId;
     bool m_canTryAgain;
     bool m_canFinish;
     QPointer<XTelepathyPasswordPrompt> m_dialog;

-- 
ktp-auth-handler packaging