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

The following commit has been merged in the master branch:
commit 61402623c21c5b8872055a026d73d5c155268ee0
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Dec 22 21:42:23 2011 +0100

    Do not pass connection to SaslAuthOp (unused)
---
 sasl-auth-op.cpp | 2 --
 sasl-auth-op.h   | 2 --
 sasl-handler.cpp | 3 ++-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/sasl-auth-op.cpp b/sasl-auth-op.cpp
index b65baac..99df66d 100644
--- a/sasl-auth-op.cpp
+++ b/sasl-auth-op.cpp
@@ -30,11 +30,9 @@
 #include <KTp/wallet-interface.h>
 
 SaslAuthOp::SaslAuthOp(const Tp::AccountPtr &account,
-        const Tp::ConnectionPtr &connection,
         const Tp::ChannelPtr &channel)
     : Tp::PendingOperation(channel),
       m_account(account),
-      m_connection(connection),
       m_channel(channel),
       m_saslIface(channel->interface<Tp::Client::ChannelInterfaceSASLAuthenticationInterface>()),
       m_canTryAgain(false)
diff --git a/sasl-auth-op.h b/sasl-auth-op.h
index e58543b..4356904 100644
--- a/sasl-auth-op.h
+++ b/sasl-auth-op.h
@@ -33,7 +33,6 @@ class SaslAuthOp : public Tp::PendingOperation
 
 public:
     SaslAuthOp(const Tp::AccountPtr &account,
-            const Tp::ConnectionPtr &connection,
             const Tp::ChannelPtr &channel);
     ~SaslAuthOp();
 
@@ -48,7 +47,6 @@ private:
     void promptUser(bool isFirstPrompt);
 
     Tp::AccountPtr m_account;
-    Tp::ConnectionPtr m_connection;
     Tp::ChannelPtr m_channel;
     Tp::Client::ChannelInterfaceSASLAuthenticationInterface *m_saslIface;
     bool m_canTryAgain;
diff --git a/sasl-handler.cpp b/sasl-handler.cpp
index ad34e37..d453725 100644
--- a/sasl-handler.cpp
+++ b/sasl-handler.cpp
@@ -54,6 +54,7 @@ void SaslHandler::handleChannels(const Tp::MethodInvocationContextPtr<> &context
         const QDateTime &userActionTime,
         const Tp::AbstractClientHandler::HandlerInfo &handlerInfo)
 {
+    Q_UNUSED(connection);
     Q_UNUSED(requestsSatisfied);
     Q_UNUSED(userActionTime);
     Q_UNUSED(handlerInfo);
@@ -62,7 +63,7 @@ void SaslHandler::handleChannels(const Tp::MethodInvocationContextPtr<> &context
 
     KTp::TelepathyHandlerApplication::newJob();
     SaslAuthOp *auth = new SaslAuthOp(
-            account, connection, channels.first());
+            account, channels.first());
     connect(auth,
             SIGNAL(ready(Tp::PendingOperation*)),
             SLOT(onAuthReady(Tp::PendingOperation*)));

-- 
ktp-auth-handler packaging