summaryrefslogtreecommitdiffstats
path: root/src/input/killX11Handler.cpp
diff options
context:
space:
mode:
authorSebastien Braun2010-11-04 00:38:24 +0100
committerSebastien Braun2010-11-04 00:38:24 +0100
commit4fcc0efae9738bb28922da592fff78cfef50277b (patch)
treeb3855b36abe874606a802ec75fc573543d2d7b35 /src/input/killX11Handler.cpp
parent[PVSMGRTOUCH] resetall bug fixed (diff)
parentDocumentation fixes and code cleanup (diff)
downloadpvs-4fcc0efae9738bb28922da592fff78cfef50277b.tar.gz
pvs-4fcc0efae9738bb28922da592fff78cfef50277b.tar.xz
pvs-4fcc0efae9738bb28922da592fff78cfef50277b.zip
Merge input handling work to master
Diffstat (limited to 'src/input/killX11Handler.cpp')
-rw-r--r--src/input/killX11Handler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/input/killX11Handler.cpp b/src/input/killX11Handler.cpp
index 7ac75a1..8fa8c24 100644
--- a/src/input/killX11Handler.cpp
+++ b/src/input/killX11Handler.cpp
@@ -25,7 +25,7 @@
using namespace std;
-void KillX11Handler::handle(InputEvent const&, InputEventContext const* ctx)
+void KillX11Handler::doHandle(InputEvent const&, InputEventContext const* ctx)
{
// Find out which display device is used:
QString displayDevice = PVSCheckPrivileges::instance()->getX11DisplayDevice(ctx);
@@ -33,7 +33,7 @@ void KillX11Handler::handle(InputEvent const&, InputEventContext const* ctx)
if(displayDevice.isNull())
{
- qWarning("Can not kill X server for %d,%d,%d: No Display Device", ctx->getSenderPid(), ctx->getSenderUid(), ctx->getSenderGid());
+ qWarning("Can not kill X server for %d,%d,%d: No Display Device", ctx->senderPid(), ctx->senderUid(), ctx->senderGid());
return;
}
@@ -85,5 +85,5 @@ void KillX11Handler::handle(InputEvent const&, InputEventContext const* ctx)
QString exe = QFileInfo(QString("/proc/%1/exe").arg(pids[0])).readLink();
qDebug("Killing X server, PID %d, exe name %s with SIGTERM", pids[0], exe.toLocal8Bit().constData());
-// kill(pids[0], SIGTERM);
+ kill(pids[0], SIGTERM);
}