[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=999eb6d

The following commit has been merged in the master branch:
commit 999eb6d6f673f9573070b801e9dee231eb93d4e5
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Wed Feb 6 13:23:13 2013 +0100

    Make registering Tp::AbstractClients more dynamic
---
 main.cpp | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/main.cpp b/main.cpp
index 01e2235..c846502 100644
--- a/main.cpp
+++ b/main.cpp
@@ -68,30 +68,24 @@ int main(int argc, char *argv[])
     Tp::ClientRegistrarPtr clientRegistrar = Tp::ClientRegistrar::create(
             accountFactory, connectionFactory, channelFactory);
 
-    int handlers = 1;
-
-    Tp::SharedPtr<SaslHandler> saslHandler = Tp::SharedPtr<SaslHandler>(new SaslHandler);
-    if (!clientRegistrar->registerClient(
-                Tp::AbstractClientPtr(saslHandler), QLatin1String("KTp.SASLHandler"))) {
-        handlers -= 1;
-    }
-
+    QMap<QString,Tp::AbstractClientPtr> handlers;
+    handlers.insert(QLatin1String("KTp.SASLHandler"), Tp::SharedPtr<SaslHandler>(new SaslHandler));
+    handlers.insert(QLatin1String("KTp.TLSHandler"), Tp::SharedPtr<TlsHandler>(new TlsHandler));
     Tp::ChannelClassSpecList confAuthFilter =  Tp::ChannelClassSpecList() << Tp::ChannelClassSpec::textChatroom();
-    Tp::SharedPtr<ConferenceAuthObserver> confAuthObserver = Tp::SharedPtr<ConferenceAuthObserver>(new ConferenceAuthObserver(confAuthFilter));
-    if (!clientRegistrar->registerClient(
-                Tp::AbstractClientPtr(confAuthObserver), QLatin1String("KTp.ConfAuthObserver"))) {
-	    kWarning() << "Could not register the room auth observer!";
-    }
+    handlers.insert(QLatin1String("KTp.ConfAuthObserver"), Tp::SharedPtr<ConferenceAuthObserver>(new ConferenceAuthObserver(confAuthFilter)));
 
-    Tp::SharedPtr<TlsHandler> tlsHandler = Tp::SharedPtr<TlsHandler>(new TlsHandler);
-    if (!clientRegistrar->registerClient(
-                Tp::AbstractClientPtr(tlsHandler), QLatin1String("KTp.TLSHandler"))) {
-        handlers -= 1;
+    int loadedHandlers = handlers.count();
+    QMap<QString,Tp::AbstractClientPtr>::ConstIterator iter = handlers.constBegin();
+    for (; iter != handlers.constEnd(); ++iter) {
+        if (!clientRegistrar->registerClient(iter.value(), iter.key())) {
+            loadedHandlers--;
+        }
     }
 
-    if (!handlers) {
+    if (loadedHandlers == 0) {
         kDebug() << "No handlers registered. Exiting";
         return 1;
     }
+
     return app.exec();
 }

-- 
ktp-auth-handler packaging