diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-05 15:08:46 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-05 15:08:46 +0900 |
| commit | 975f19a704fe395947c209c0fc4c164f3a1de5b6 (patch) | |
| tree | 80cb0e8f157b4064eaba1a67b218521dbc62fc10 /kdesktop/lock/main.cc | |
| parent | 6a31c6a61f47083cde645b1c32f769871ed450b3 (diff) | |
| parent | 868c510ed63f27464d74b0c5e8f71f765c02f563 (diff) | |
| download | tdebase-975f19a704fe395947c209c0fc4c164f3a1de5b6.tar.gz tdebase-975f19a704fe395947c209c0fc4c164f3a1de5b6.zip | |
Merged code for bug 1584 from local branch
Diffstat (limited to 'kdesktop/lock/main.cc')
| -rw-r--r-- | kdesktop/lock/main.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index c90c2ef6b..2a8a6657d 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,6 +445,7 @@ 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; |