[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=17f8ebb

The following commit has been merged in the master branch:
commit 17f8ebb68696e99e6063b507f24a6bad9a1dab8a
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Mon Nov 18 03:31:59 2013 +0100

    Added standalone binary to run kdeconnect without kded
---
 kded/CMakeLists.txt | 19 +++++++++++++++++++
 kded/daemon.cpp     |  2 ++
 kded/daemon.h       |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index 152232b..0134af8 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -58,3 +58,22 @@ generate_and_install_dbus_interface(
 install(TARGETS kded_kdeconnect DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES kdeconnect.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded)
 install(FILES kdeconnect.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kdeconnect)
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+ 
+	set(kdeconnect_standalone_SRCS
+		${kded_kdeconnect_SRCS}
+		main.cpp
+	)
+	kde4_add_executable(kdeconnect_standalone ${kdeconnect_standalone_SRCS})
+	target_link_libraries(kdeconnect_standalone
+		${KDE4_KDECORE_LIBS}
+		${KDE4_KDEUI_LIBS}
+		${KDE4_KIO_LIBS}
+		${QT_QTNETWORK_LIBRARY}
+		${QJSON_LIBRARIES}
+		${QCA2_LIBRARIES}
+	)
+	install(TARGETS kdeconnect_standalone ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ endif()
\ No newline at end of file
diff --git a/kded/daemon.cpp b/kded/daemon.cpp
index 1700dde..31598c5 100644
--- a/kded/daemon.cpp
+++ b/kded/daemon.cpp
@@ -98,6 +98,7 @@ Daemon::Daemon(QObject *parent, const QList<QVariant>&)
     }
 
     QDBusConnection::sessionBus().registerService("org.kde.kdeconnect");
+    QDBusConnection::sessionBus().registerObject("/modules/kdeconnect", this, QDBusConnection::ExportScriptableContents);
 
     setDiscoveryEnabled(true);
 
@@ -140,6 +141,7 @@ QStringList Daemon::devices()
 
 void Daemon::onNewDeviceLink(const NetworkPackage& identityPackage, DeviceLink* dl)
 {
+
     const QString& id = identityPackage.get<QString>("deviceId");
 
     //kDebug(kdeconnect_kded()) << "Device discovered" << id << "via" << dl->provider()->name();
diff --git a/kded/daemon.h b/kded/daemon.h
index 957557c..b4b7594 100644
--- a/kded/daemon.h
+++ b/kded/daemon.h
@@ -73,7 +73,7 @@ private:
     QMap<QString, Device*> mDevices;
 
     // The Initializer object sets things up, and also does cleanup when it goes out of scope
-    QCA::Initializer init;
+    QCA::Initializer mQcaInitializer;
 
 };
 

-- 
kdeconnect packaging