[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=654c231

The following commit has been merged in the master branch:
commit 654c231a9ffdd2b5b742fb72847d651aba2ae9f6
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Oct 11 16:22:44 2012 +0100

    Move channel filters out of main and with the relevant handler
    
    Code cleanup.
    
    REVIEW: 106736
---
 main.cpp         | 14 ++------------
 sasl-handler.cpp | 17 +++++++++++++++--
 sasl-handler.h   |  2 +-
 tls-handler.cpp  | 12 ++++++++++--
 tls-handler.h    |  2 +-
 5 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/main.cpp b/main.cpp
index d77d800..fcf7a61 100644
--- a/main.cpp
+++ b/main.cpp
@@ -68,24 +68,14 @@ int main(int argc, char *argv[])
 
     int handlers = 1;
 
-    Tp::ChannelClassSpecList saslFilter;
-    QVariantMap saslOtherProperties;
-    saslOtherProperties.insert(
-            TP_QT_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION + QLatin1String(".AuthenticationMethod"),
-            TP_QT_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION);
-    saslFilter.append(Tp::ChannelClassSpec(TP_QT_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION,
-                Tp::HandleTypeNone, false, saslOtherProperties));
-    Tp::SharedPtr<SaslHandler> saslHandler = Tp::SharedPtr<SaslHandler>(new SaslHandler(saslFilter));
+    Tp::SharedPtr<SaslHandler> saslHandler = Tp::SharedPtr<SaslHandler>(new SaslHandler);
     if (!clientRegistrar->registerClient(
                 Tp::AbstractClientPtr(saslHandler), QLatin1String("KTp.SASLHandler"))) {
         handlers -= 1;
     }
 
 #if 0
-    Tp::ChannelClassSpecList tlsFilter;
-    tlsFilter.append(Tp::ChannelClassSpec(TP_QT_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION,
-                Tp::HandleTypeNone, false));
-    Tp::SharedPtr<TlsHandler> tlsHandler = Tp::SharedPtr<TlsHandler>(new TlsHandler(tlsFilter));
+    Tp::SharedPtr<TlsHandler> tlsHandler = Tp::SharedPtr<TlsHandler>(new TlsHandler);
     if (!clientRegistrar->registerClient(
                 Tp::AbstractClientPtr(tlsHandler), QLatin1String("KTp.TLSHandler"))) {
         handlers -= 1;
diff --git a/sasl-handler.cpp b/sasl-handler.cpp
index d453725..acc4559 100644
--- a/sasl-handler.cpp
+++ b/sasl-handler.cpp
@@ -27,13 +27,26 @@
 #include <QDBusConnection>
 
 #include <TelepathyQt/Channel>
+#include <TelepathyQt/ChannelClassSpecList>
 #include <TelepathyQt/ChannelDispatchOperation>
 #include <TelepathyQt/MethodInvocationContext>
 
 #include <KDebug>
 
-SaslHandler::SaslHandler(const Tp::ChannelClassSpecList &channelFilter)
-    : Tp::AbstractClientHandler(channelFilter)
+static inline Tp::ChannelClassSpecList channelFilter() {
+    Tp::ChannelClassSpecList filter;
+    QVariantMap saslOtherProperties;
+    saslOtherProperties.insert(
+            TP_QT_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION + QLatin1String(".AuthenticationMethod"),
+            TP_QT_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION);
+    filter.append(Tp::ChannelClassSpec(TP_QT_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION,
+                Tp::HandleTypeNone, false, saslOtherProperties));
+    return filter;
+}
+
+
+SaslHandler::SaslHandler()
+    : Tp::AbstractClientHandler(channelFilter())
 {
 }
 
diff --git a/sasl-handler.h b/sasl-handler.h
index dcb34e4..5e1e1fb 100644
--- a/sasl-handler.h
+++ b/sasl-handler.h
@@ -37,7 +37,7 @@ class SaslHandler : public QObject, public Tp::AbstractClientHandler
     Q_OBJECT
 
 public:
-    explicit SaslHandler(const Tp::ChannelClassSpecList &channelFilter);
+    explicit SaslHandler();
     ~SaslHandler();
 
     bool bypassApproval() const;
diff --git a/tls-handler.cpp b/tls-handler.cpp
index 038d26d..7686192 100644
--- a/tls-handler.cpp
+++ b/tls-handler.cpp
@@ -26,13 +26,21 @@
 #include <QDBusConnection>
 
 #include <TelepathyQt/Channel>
+#include <TelepathyQt/ChannelClassSpecList>
 #include <TelepathyQt/ChannelDispatchOperation>
 #include <TelepathyQt/MethodInvocationContext>
 
 #include <KDebug>
 
-TlsHandler::TlsHandler(const Tp::ChannelClassSpecList &channelFilter)
-    : Tp::AbstractClientHandler(channelFilter)
+static inline Tp::ChannelClassSpecList channelFilter() {
+    Tp::ChannelClassSpecList filter;
+    filter.append(Tp::ChannelClassSpec(TP_QT_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION,
+                Tp::HandleTypeNone, false));
+    return filter;
+}
+
+TlsHandler::TlsHandler()
+    : Tp::AbstractClientHandler(channelFilter())
 {
 }
 
diff --git a/tls-handler.h b/tls-handler.h
index 0e036b1..7cb962e 100644
--- a/tls-handler.h
+++ b/tls-handler.h
@@ -36,7 +36,7 @@ class TlsHandler : public QObject, public Tp::AbstractClientHandler
     Q_OBJECT
 
 public:
-    explicit TlsHandler(const Tp::ChannelClassSpecList &channelFilter);
+    explicit TlsHandler();
     ~TlsHandler();
 
     bool bypassApproval() const;

-- 
ktp-auth-handler packaging