diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-01 13:15:49 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-01 13:15:49 +0900 |
| commit | a6fbc0f1e09859de2a8414b00c8b39082b0f974e (patch) | |
| tree | 09e7fa38141065d723b4b9928e48266a01d9a2af /kdesktop/lock/main.cc | |
| parent | 66faad37caa38d4ffd4dcc4d227b7f7131b31977 (diff) | |
| download | tdebase-a6fbc0f1e09859de2a8414b00c8b39082b0f974e.tar.gz tdebase-a6fbc0f1e09859de2a8414b00c8b39082b0f974e.zip | |
Commits ccb5fca, 59ef38d, 710fc43 re-pushed to local branch for further development.
This relates to bug 1584.
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; |