[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=388be5c

The following commit has been merged in the master branch:
commit 388be5cb08699b2eca0f580d1bc49bdfa545780d
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Oct 6 12:53:16 2011 +0100

    Try to register both handlers before exiting
---
 main.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/main.cpp b/main.cpp
index 4b67320..aebe8ee 100644
--- a/main.cpp
+++ b/main.cpp
@@ -20,6 +20,7 @@
 #include <KAboutData>
 #include <KCmdLineArgs>
 #include <KApplication>
+#include <KDebug>
 
 #include <TelepathyQt4/AccountFactory>
 #include <TelepathyQt4/AccountManager>
@@ -71,6 +72,8 @@ int main(int argc, char *argv[])
     Tp::ClientRegistrarPtr clientRegistrar = Tp::ClientRegistrar::create(
             accountFactory, connectionFactory, channelFactory);
 
+    int handlers = 2;
+
     Tp::ChannelClassSpecList saslFilter;
     QVariantMap saslOtherProperties;
     saslOtherProperties.insert(
@@ -81,7 +84,7 @@ int main(int argc, char *argv[])
     Tp::SharedPtr<SaslHandler> saslHandler = Tp::SharedPtr<SaslHandler>(new SaslHandler(saslFilter));
     if (!clientRegistrar->registerClient(
                 Tp::AbstractClientPtr(saslHandler), QLatin1String("KDE.SASL.Handler"))) {
-        return 1;
+        handlers -= 1;
     }
 
     Tp::ChannelClassSpecList tlsFilter;
@@ -90,6 +93,12 @@ int main(int argc, char *argv[])
     Tp::SharedPtr<TlsHandler> tlsHandler = Tp::SharedPtr<TlsHandler>(new TlsHandler(tlsFilter));
     if (!clientRegistrar->registerClient(
                 Tp::AbstractClientPtr(tlsHandler), QLatin1String("KDE.TLS.Handler"))) {
+        handlers -= 1;
+    }
+
+    if (!handlers)
+    {
+        kDebug() << "No handlers registered. Exiting";
         return 1;
     }
     return app.exec();

-- 
ktp-auth-handler packaging