From 66faad37caa38d4ffd4dcc4d227b7f7131b31977 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 1 May 2014 13:04:21 +0900 Subject: 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. --- kdesktop/lock/main.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'kdesktop/lock/main.cc') 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; -- cgit v1.2.3