summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-02-07 21:32:15 -0600
committerTimothy Pearson <[email protected]>2012-02-07 21:32:15 -0600
commit8d521d0b6ba88c6e679e7453f02897c8db7bbdf5 (patch)
tree9d54eeecde18c3a57c30eb7dbc93dd6e16679591 /kdesktop/lock
parenteba2e1a1af6c0ae83b6104c0178c29b9bd8ac209 (diff)
downloadtdebase-8d521d0b6ba88c6e679e7453f02897c8db7bbdf5.tar.gz
tdebase-8d521d0b6ba88c6e679e7453f02897c8db7bbdf5.zip
Update lock process to engage the lock in near real time
Diffstat (limited to 'kdesktop/lock')
-rw-r--r--kdesktop/lock/CMakeLists.txt2
-rw-r--r--kdesktop/lock/main.cc8
2 files changed, 9 insertions, 1 deletions
diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt
index 5530d4c5c..7a351210b 100644
--- a/kdesktop/lock/CMakeLists.txt
+++ b/kdesktop/lock/CMakeLists.txt
@@ -35,6 +35,6 @@ set( ${target}_SRCS
tde_add_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdesktopsettings-static dmctl-static kio-shared Xext ${GL_LIBRARY}
+ LINK kdesktopsettings-static dmctl-static kio-shared Xext ${GL_LIBRARY} "-z\ now"
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 0cbef6095..132ff3094 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -1,6 +1,7 @@
/* This file is part of the KDE project
Copyright (C) 1999 David Faure
Copyright (c) 2003 Oswald Buddenhagen <[email protected]>
+ Copyright (c) 2010-2012 Timothy Pearson <[email protected]>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -43,6 +44,13 @@ bool trinity_desktop_lock_use_sak = FALSE;
bool trinity_desktop_lock_forced = FALSE;
+bool signalled_forcelock;
+bool signalled_dontlock;
+bool signalled_securedialog;
+bool signalled_blank;
+bool signalled_run;
+bool in_internal_mode = FALSE;
+
bool MyApp::x11EventFilter( XEvent *ev )
{
if (ev->type == XKeyPress || ev->type == ButtonPress) {