summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock/main.cc
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-05-01 13:04:21 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-05-01 13:04:21 +0900
commit66faad37caa38d4ffd4dcc4d227b7f7131b31977 (patch)
tree9a5e0ebfebe947c93d767f657a0827268e7138d5 /kdesktop/lock/main.cc
parent60b66b1fc27bb9695765e30f56ffd0d622ff5458 (diff)
downloadtdebase-66faad37caa38d4ffd4dcc4d227b7f7131b31977.tar.gz
tdebase-66faad37caa38d4ffd4dcc4d227b7f7131b31977.zip
Temporarily reverted commits ccb5fca, 59ef38d, 710fc43.
The code for these commits will be pushed again later once a fix for SAK-enabled systems has been developed and tested. This relates to bug 1584.
Diffstat (limited to 'kdesktop/lock/main.cc')
-rw-r--r--kdesktop/lock/main.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 2a8a6657d..c90c2ef6b 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -70,7 +70,7 @@ bool trinity_desktop_lock_use_system_modal_dialogs = FALSE;
bool trinity_desktop_lock_delay_screensaver_start = FALSE;
bool trinity_desktop_lock_use_sak = FALSE;
bool trinity_desktop_lock_hide_active_windows = FALSE;
-bool trinity_desktop_lock_hide_cancel_button = FALSE;
+
bool trinity_desktop_lock_forced = FALSE;
bool signalled_forcelock;
@@ -445,7 +445,6 @@ int main( int argc, char **argv )
trinity_desktop_lock_delay_screensaver_start = false; // If trinity_desktop_lock_delay_screensaver_start is true with unmanaged windows, the lock dialog may never appear
}
trinity_desktop_lock_hide_active_windows = KDesktopSettings::hideActiveWindowsFromSaver();
- trinity_desktop_lock_hide_cancel_button = KDesktopSettings::hideCancelButton();
delete tdmconfig;