[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=84a5735

The following commit has been merged in the master branch:
commit 84a5735e6138038d39bb2cab37fd5266d3af4f43
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Tue Jun 14 16:00:40 2016 +0200

    Removing code that I just couldn't understand (so I assume it does nothing)
---
 daemon/kdeconnectd.cpp | 42 ------------------------------------------
 1 file changed, 42 deletions(-)

diff --git a/daemon/kdeconnectd.cpp b/daemon/kdeconnectd.cpp
index 180cc53..e973115 100644
--- a/daemon/kdeconnectd.cpp
+++ b/daemon/kdeconnectd.cpp
@@ -21,7 +21,6 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include <QSocketNotifier>
 #include <QApplication>
 #include <QNetworkAccessManager>
 
@@ -39,46 +38,6 @@
 #include "kdeconnecttelepathyprotocolfactory.h"
 #endif
 
-
-#ifndef Q_OS_WIN
-#include <sys/socket.h>
-#endif
-
-static int sigtermfd[2];
-const static char deadbeef = 1;
-
-
-// TODO: Implement for Windows.
-#ifndef Q_OS_WIN
-struct sigaction action;
-#endif
-
-void sighandler(int signum)
-{
-    if( signum == SIGTERM || signum == SIGINT)
-    {
-        ssize_t unused = ::write(sigtermfd[0], &deadbeef, sizeof(deadbeef));
-        Q_UNUSED(unused);
-    }
-}
-
-void initializeTermHandlers(QCoreApplication* app, Daemon* daemon)
-{
-// TODO: Implement for Windows.
-#ifndef Q_OS_WIN
-    ::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;
-
-    sigaction(SIGTERM, &action, nullptr);
-    sigaction(SIGINT, &action, nullptr);
-#endif
-}
-
 class DesktopDaemon : public Daemon
 {
     Q_OBJECT
@@ -131,7 +90,6 @@ int main(int argc, char* argv[])
 
     Daemon* daemon = new DesktopDaemon;
     QObject::connect(daemon, SIGNAL(destroyed(QObject*)), &app, SLOT(quit()));
-    initializeTermHandlers(&app, daemon);
     
 #ifdef HAVE_TELEPATHY
     //keep a reference to the KTP CM so that we can register on DBus

-- 
kdeconnect packaging