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

The following commit has been merged in the master branch:
commit eaf55cb0df035649cd28a09b9cdc0abbadcf141f
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Sun Jul 17 14:00:17 2011 +0100

    Make ft-handler a KApplication instead of a KUniqueApplication
    
    KUniqueApplication does some forking magic and you can miss some early
    dbus messages from MC and you don't really gain anything as mission
    control/dbus will avoid starting mulitple instances of you anyway.
    
    Suggested-by: David Edmundson <kde at davidedmundson.co.uk>
---
 AUTHORS      | 1 +
 src/main.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index ab37ba0..66a23ba 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,3 +2,4 @@ Daniele E. Domenichelli (drdanz) <daniele.domenichelli at gmail.com>
 
 Contributors:
 George Kiagiadakis (gkiagia) <george.kiagiadakis at collabora.com>
+David Edmundson (d_ed) <kde at davidedmundson.co.uk>
diff --git a/src/main.cpp b/src/main.cpp
index 6a122dc..869b1d4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,7 +21,7 @@
 
 #include <KAboutData>
 #include <KCmdLineArgs>
-#include <KUniqueApplication>
+#include <KApplication>
 #include <TelepathyQt4/ClientRegistrar>
 #include <TelepathyQt4/FileTransferChannel>
 
@@ -41,7 +41,7 @@ int main(int argc, char* argv[])
     KCmdLineArgs::addCmdLineOptions(options);
 
     KCmdLineArgs::init(argc, argv, &aboutData);
-    KUniqueApplication app;
+    KApplication app;
     app.setQuitOnLastWindowClosed(false);
 
     Tp::registerTypes();

-- 
ktp-filetransfer-handler packaging