[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/15.12.1-2-226-g825cd93

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=53d1659

The following commit has been merged in the master branch:
commit 53d1659670b5d79727182ed67118047c295c4ea8
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Sep 14 18:04:10 2011 +0100

    Exit File Transfer Handler if DBus name is already taken
---
 src/main.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 50ea9e3..eca8e2f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,6 +22,7 @@
 #include <KAboutData>
 #include <KCmdLineArgs>
 #include <KApplication>
+#include <KDebug>
 #include <TelepathyQt4/ClientRegistrar>
 #include <TelepathyQt4/FileTransferChannel>
 
@@ -68,8 +69,10 @@ int main(int argc, char* argv[])
 
     Tp::SharedPtr<FileTransferHandler> fth = Tp::SharedPtr<FileTransferHandler>(
             new FileTransferHandler(KCmdLineArgs::parsedArgs()->isSet("persist"), &app));
-    registrar->registerClient(Tp::AbstractClientPtr(fth),
-                              QLatin1String("KDE.FileTransfer"));
+    if(!registrar->registerClient(Tp::AbstractClientPtr(fth), QLatin1String("KDE.FileTransfer"))) {
+        kDebug() << "File Transfer Handler already running. Exiting";
+        return 1;
+    }
 
     QTimer::singleShot(60000, fth.data(), SLOT(onTimeout()));
 

-- 
ktp-filetransfer-handler packaging