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

The following commit has been merged in the master branch:
commit b9f1bdc975e1b5695c603fbc21e937825d76a567
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Oct 13 18:58:12 2011 +0200

    Use TelepathyHandlerApplication to allow exiting
---
 CMakeLists.txt   |  8 +++++++-
 main.cpp         | 12 ++----------
 sasl-handler.cpp |  3 +++
 tls-handler.cpp  |  3 +++
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e1e706..222b8fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,10 @@ execute_process(COMMAND git submodule update
 endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
 
 
+set (telepathy_kde_common_internals_SRCS
+     common/telepathy-handler-application.cpp
+)
+
 set(telepathy_kde_auth_handler_SRCS
     main.cpp
     password-prompt.cpp
@@ -38,7 +42,9 @@ set(telepathy_kde_auth_handler_SRCS
     sasl-auth-op.cpp
     tls-cert-verifier-op.cpp
     tls-handler.cpp
-    types.cpp)
+    types.cpp
+    ${telepathy_kde_common_internals_SRCS}
+)
 
 kde4_add_ui_files(telepathy_kde_auth_handler_SRCS password-prompt.ui)
 kde4_add_executable(telepathy-kde-auth-handler ${telepathy_kde_auth_handler_SRCS})
diff --git a/main.cpp b/main.cpp
index aebe8ee..39bb083 100644
--- a/main.cpp
+++ b/main.cpp
@@ -34,6 +34,7 @@
 
 #include "sasl-handler.h"
 #include "tls-handler.h"
+#include "common/telepathy-handler-application.h"
 
 // FIXME: Move this to tp-qt4 itself
 #include "types.h"
@@ -47,20 +48,11 @@ int main(int argc, char *argv[])
     aboutData.addAuthor(ki18n("David Edmundson"), ki18n("Developer"), "kde at davidedmundson.co.uk");
     aboutData.setProductName("telepathy/auth-handler");
 
-    // Add --debug commandline options
-    KCmdLineOptions options;
-    options.add("debug", ki18n("Show Telepathy debugging information"));
-    KCmdLineArgs::addCmdLineOptions(options);
-
     KCmdLineArgs::init(argc, argv, &aboutData);
-    KApplication app;
-    app.setQuitOnLastWindowClosed(false);
+    KTelepathy::TelepathyHandlerApplication app;
 
-    Tp::registerTypes();
     // FIXME: Move this to tp-qt4 itself
     registerTypes();
-    Tp::enableDebug(KCmdLineArgs::parsedArgs()->isSet("debug"));
-    Tp::enableWarnings(true);
 
     Tp::AccountFactoryPtr accountFactory = Tp::AccountFactory::create(
             QDBusConnection::sessionBus(), Tp::Account::FeatureCore);
diff --git a/sasl-handler.cpp b/sasl-handler.cpp
index c845eb8..54adf76 100644
--- a/sasl-handler.cpp
+++ b/sasl-handler.cpp
@@ -21,6 +21,7 @@
 #include "sasl-handler.h"
 
 #include "sasl-auth-op.h"
+#include "common/telepathy-handler-application.h"
 
 #include <QDBusConnection>
 
@@ -58,6 +59,7 @@ void SaslHandler::handleChannels(const Tp::MethodInvocationContextPtr<> &context
     Q_UNUSED(userActionTime);
     Q_UNUSED(handlerInfo);
 
+    KTelepathy::TelepathyHandlerApplication::newJob();
     SaslAuthOp *auth = new SaslAuthOp(
             account, connection, channels.first(), m_wallet);
     connect(auth,
@@ -88,6 +90,7 @@ void SaslHandler::onAuthFinished(Tp::PendingOperation *op)
     }
 
     mAuthContexts.remove(auth);
+    KTelepathy::TelepathyHandlerApplication::jobFinished();
 }
 
 #include "sasl-handler.moc"
diff --git a/tls-handler.cpp b/tls-handler.cpp
index b8489b7..840b0e6 100644
--- a/tls-handler.cpp
+++ b/tls-handler.cpp
@@ -20,6 +20,7 @@
 #include "tls-handler.h"
 
 #include "tls-cert-verifier-op.h"
+#include "common/telepathy-handler-application.h"
 
 #include <QDBusConnection>
 
@@ -55,6 +56,7 @@ void TlsHandler::handleChannels(const Tp::MethodInvocationContextPtr<> &context,
     Q_UNUSED(userActionTime);
     Q_UNUSED(handlerInfo);
 
+    KTelepathy::TelepathyHandlerApplication::newJob();
     TlsCertVerifierOp *verifier = new TlsCertVerifierOp(
             account, connection, channels.first());
     connect(verifier,
@@ -85,6 +87,7 @@ void TlsHandler::onCertVerifierFinished(Tp::PendingOperation *op)
     }
 
     mVerifiers.remove(verifier);
+    KTelepathy::TelepathyHandlerApplication::jobFinished();
 }
 
 #include "tls-handler.moc"

-- 
ktp-auth-handler packaging