[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=c2f6956

The following commit has been merged in the master branch:
commit c2f6956d9320fee2ff87dfb6d5c9478bcffae56a
Author: Àlex Fiestas <afiestas at kde.org>
Date:   Mon Sep 22 01:53:07 2014 +0200

    Port kdeconnectd to KDBusServices and QGuiApp
---
 kded/CMakeLists.txt  |  2 +-
 kded/kdeconnectd.cpp | 30 +++++++++++-------------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index d1e1365..92952f7 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -4,7 +4,7 @@ add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-kded")
 configure_file(config-kded.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kded.h)
 
 add_executable(kdeconnectd kdeconnectd.cpp)
-target_link_libraries(kdeconnectd kdeconnectcore KF5::ConfigWidgets)
+target_link_libraries(kdeconnectd kdeconnectcore KF5::DBusAddons KF5::ConfigWidgets)
 
 add_library(kded_kdeconnect MODULE kded.cpp)
 
diff --git a/kded/kdeconnectd.cpp b/kded/kdeconnectd.cpp
index 6d2fdf8..88ffa39 100644
--- a/kded/kdeconnectd.cpp
+++ b/kded/kdeconnectd.cpp
@@ -24,9 +24,9 @@
 #include <unistd.h>
 
 #include <QSocketNotifier>
-#include <KUniqueApplication>
-#include <k4aboutdata.h>
-#include <KCmdLineArgs>
+#include <QGuiApplication>
+
+#include <KDBusService>
 
 #include "core/daemon.h"
 
@@ -48,7 +48,7 @@ void initializeTermHandlers(QCoreApplication* app, Daemon* daemon)
     ::socketpair(AF_UNIX, SOCK_STREAM, 0, sigtermfd);
     QSocketNotifier* snTerm = new QSocketNotifier(sigtermfd[1], QSocketNotifier::Read, app);
     QObject::connect(snTerm, SIGNAL(activated(int)), daemon, SLOT(deleteLater()));
-    
+
     action.sa_handler = sighandler;
     sigemptyset(&action.sa_mask);
     action.sa_flags = 0;
@@ -59,28 +59,20 @@ void initializeTermHandlers(QCoreApplication* app, Daemon* daemon)
 
 int main(int argc, char* argv[])
 {
-    K4AboutData aboutData("kdeconnect", "kdeconnect-kded",
-                          ki18n("kdeconnect"),
-                          "0.1",
-                          ki18n("Connect your devices and KDE"),
-                          K4AboutData::License_GPL,
-                          KLocalizedString(),
-                          KLocalizedString(),
-                          "http://albertvaka.wordpress.com");
-
-    aboutData.setOrganizationDomain("kde.org");
+    QCoreApplication::setApplicationName("kdeconnect");
+    QCoreApplication::setApplicationVersion("0.1");
+    QCoreApplication::setOrganizationDomain("kde.org");
 
-    KCmdLineArgs::init(argc, argv, &aboutData);
-    
-    KUniqueApplication app(true); // WARNING GUI required for QClipboard access
-    app.disableSessionManagement();
+    QGuiApplication app(argc, argv);
     app.setQuitOnLastWindowClosed(false);
 
+    KDBusService dbusService(KDBusService::Unique);
+
     //Force daemon to destroy when KApplications in alive
     //belongs to bug KApplications resoure freeing
     Daemon* daemon = new Daemon(0);
     QObject::connect(daemon, SIGNAL(destroyed(QObject*)), &app, SLOT(quit()));
     initializeTermHandlers(&app, daemon);
-    
+
     return app.exec();
 }

-- 
kdeconnect packaging