summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock/lockprocess.cc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-21 23:21:48 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-21 23:21:48 +0000
commit60de68e5c083d6b504912461505de5dee1e0afb1 (patch)
tree92b78af56acdd23ab7501379b83df59d655f8d42 /kdesktop/lock/lockprocess.cc
parentcc0aef7dbfc211d32dd90d903f910f4454d86f59 (diff)
downloadtdebase-60de68e5c083d6b504912461505de5dee1e0afb1.tar.gz
tdebase-60de68e5c083d6b504912461505de5dee1e0afb1.zip
Fix ksmserver shutdown screen in ARGB mode
Do not exit the secure dialog on DCOP screensaver quit request git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1254881 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdesktop/lock/lockprocess.cc')
-rw-r--r--kdesktop/lock/lockprocess.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index c8681c6df..93fe4d9ae 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -316,9 +316,11 @@ static int signal_pipe[2];
static void sigterm_handler(int)
{
- char tmp = 'T';
- if (::write( signal_pipe[1], &tmp, 1) == -1) {
- // Error handler to shut up gcc warnings
+ if (!trinity_desktop_lock_in_sec_dlg) {
+ char tmp = 'T';
+ if (::write( signal_pipe[1], &tmp, 1) == -1) {
+ // Error handler to shut up gcc warnings
+ }
}
}
@@ -657,7 +659,7 @@ void LockProcess::startSecureDialog()
kapp->quit();
}
// FIXME
- // Handle remaining two cases (task manager and logoff menu)
+ // Handle remaining two cases (logoff menu and switch user)
stopSaver();
}