From fd83b6d70f6266daeac760ee65407876faf52dbe Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Thu, 8 Dec 2011 10:06:53 +0200 Subject: [PATCH] desktop-shell: add option to not use locking Add an option to the desktop-shell ini file that defines whether screen locking is used or not. Useful for testing screensaver interactions without a lock surface. Signed-off-by: Pekka Paalanen --- clients/desktop-shell.c | 7 +++++++ wayland-desktop-shell.ini | 1 + 2 files changed, 8 insertions(+) diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c index 23c8c401..acd39e86 100644 --- a/clients/desktop-shell.c +++ b/clients/desktop-shell.c @@ -96,10 +96,12 @@ static uint32_t key_panel_color; static char *key_launcher_icon; static char *key_launcher_path; static void launcher_section_done(void *data); +static int key_locking = 1; static const struct config_key shell_config_keys[] = { { "background-image", CONFIG_KEY_STRING, &key_background_image }, { "panel-color", CONFIG_KEY_INTEGER, &key_panel_color }, + { "locking", CONFIG_KEY_BOOLEAN, &key_locking }, }; static const struct config_key launcher_config_keys[] = { @@ -513,6 +515,11 @@ desktop_shell_prepare_lock_surface(void *data, { struct desktop *desktop = data; + if (!key_locking) { + desktop_shell_unlock(desktop->shell); + return; + } + if (!desktop->unlock_dialog) { desktop->unlock_dialog = unlock_dialog_create(desktop); desktop->unlock_dialog->desktop = desktop; diff --git a/wayland-desktop-shell.ini b/wayland-desktop-shell.ini index 8c7c1f94..3a869353 100644 --- a/wayland-desktop-shell.ini +++ b/wayland-desktop-shell.ini @@ -1,6 +1,7 @@ [wayland-desktop-shell] background-image=/usr/share/backgrounds/gnome/Aqua.jpg panel-color=0x90ff0000 +locking=true [launcher] icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png