diff options
author | Fabian Schillinger | 2010-11-05 02:10:04 +0100 |
---|---|---|
committer | Fabian Schillinger | 2010-11-05 02:10:04 +0100 |
commit | c850c907ff61bf4798bdb4fa59f4679f9ba1287a (patch) | |
tree | 61aa14589cbec54eaf14b4b9f8e9100da28af9e8 /src/input/killX11Handler.cpp | |
parent | Process start/stop/view functionality (diff) | |
parent | Merge remote branch 'origin/master' (diff) | |
download | pvs-c850c907ff61bf4798bdb4fa59f4679f9ba1287a.tar.gz pvs-c850c907ff61bf4798bdb4fa59f4679f9ba1287a.tar.xz pvs-c850c907ff61bf4798bdb4fa59f4679f9ba1287a.zip |
Merge branch 'master' of openslx.org:pvs
Conflicts:
src/gui/mainWindow.cpp
Diffstat (limited to 'src/input/killX11Handler.cpp')
-rw-r--r-- | src/input/killX11Handler.cpp | 6 |
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); } |