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

The following commit has been merged in the master branch:
commit f83ad76a5f0f3b093d61a848bfef458f652cf120
Author: Samoilenko Yuri <kinnalru at gmail.com>
Date:   Sat Jan 18 02:06:47 2014 +0400

    Daemon works now
---
 kded/CMakeLists.txt  |  2 +-
 kded/kdeconnectd.cpp |  5 +++--
 kded/kded.cpp        | 14 +++++---------
 kded/kded.h          |  2 +-
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index 6c5b2ad..e2dcb21 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -69,7 +69,7 @@ generate_and_install_dbus_interface(
 generate_and_install_dbus_interface(
     kded_kdeconnect
     kded.h
-    org.kde.kdeconnect.kded.xml
+    org.kde.kded.kdeconnect.xml
     OPTIONS -a
 )
 
diff --git a/kded/kdeconnectd.cpp b/kded/kdeconnectd.cpp
index 4c5cfe0..5929256 100644
--- a/kded/kdeconnectd.cpp
+++ b/kded/kdeconnectd.cpp
@@ -1,8 +1,9 @@
 
 #include <sys/socket.h>
+#include <unistd.h>
 #include <signal.h>
 
-#include <QCoreApplication>
+#include <QApplication>
 #include <QSocketNotifier>
 
 #include "daemon.h"
@@ -36,7 +37,7 @@ void initializeTermHandlers(QCoreApplication* app)
 
 int main(int argc, char* argv[])
 {
-    QCoreApplication app(argc, argv);
+    QApplication app(argc, argv);
 
     initializeTermHandlers(&app);
     new Daemon(&app);
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 68b37de..588af75 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -35,15 +35,12 @@ Kded::Kded(QObject *parent, const QList<QVariant>&)
     : KDEDModule(parent)
     , m_daemon(0)
 {
-    QDBusConnection::sessionBus().registerService("org.kde.kdeconnect");
-    QDBusConnection::sessionBus().registerObject("/modules/kdeconnect/kded", this, QDBusConnection::ExportScriptableContents);
     start();
     kDebug(kdeconnect_kded()) << "kded_kdeconnect started"; 
 }
 
 Kded::~Kded()
 {
-    QDBusConnection::sessionBus().unregisterObject("/modules/kdeconnect/kded");
     stop();
     kDebug(kdeconnect_kded()) << "kded_kdeconnect stopped";
 }
@@ -63,6 +60,7 @@ bool Kded::start()
     connect(m_daemon, SIGNAL(finished(int,QProcess::ExitStatus)), m_daemon, SLOT(deleteLater()));
     
     m_daemon->setProgram(daemon);
+    m_daemon->setOutputChannelMode(KProcess::SeparateChannels);
     m_daemon->start();
     if (!m_daemon->waitForStarted(10000))
     {
@@ -70,9 +68,7 @@ bool Kded::start()
         return false;
     }
 
-    m_daemon->closeReadChannel(KProcess::StandardError);
     m_daemon->closeReadChannel(KProcess::StandardOutput);
-    m_daemon->closeWriteChannel();
     
     kDebug(kdeconnect_kded()) << "Daemon successfuly started";
     return true;
@@ -109,17 +105,17 @@ void Kded::onError(QProcess::ProcessError errorCode)
 
 void Kded::onFinished(int exitCode, QProcess::ExitStatus status)
 {
-    m_daemon = 0;
-    
     if (status == QProcess::CrashExit)
     {
-        kError(kdeconnect_kded()) << "Process crashed code=" << exitCode;
+        kError(kdeconnect_kded()) << "Process crashed with code=" << exitCode;
+        kError(kdeconnect_kded()) << m_daemon->readAllStandardError();
         kWarning(kdeconnect_kded()) << "Restarting in 5 sec...";
         QTimer::singleShot(5000, this, SLOT(start()));        
     }
     else
     {
-        kWarning(kdeconnect_kded()) << "Process finished code=" << exitCode;
+        kWarning(kdeconnect_kded()) << "Process finished with code=" << exitCode;
     }
+    m_daemon = 0;
 }
 
diff --git a/kded/kded.h b/kded/kded.h
index 5b5b0a4..da24752 100644
--- a/kded/kded.h
+++ b/kded/kded.h
@@ -28,7 +28,7 @@ class Kded
     : public KDEDModule
 {
     Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.kde.kdeconnect.kded")
+    Q_CLASSINFO("D-Bus Interface", "org.kde.kded.kdeconnect")
 
 public:
     Kded(QObject *parent, const QList<QVariant>&);

-- 
kdeconnect packaging