From f8ca0d13bccc0bb7b5ffb39980653716ac3ad614 Mon Sep 17 00:00:00 2001 From: Sean Davis Date: Wed, 14 Mar 2018 20:29:41 -0400 Subject: Add config item for enabling at-spi-command --- src/greeterconfiguration.h | 1 + src/lightdm-gtk-greeter.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/greeterconfiguration.h b/src/greeterconfiguration.h index 98d3366..6d56dfb 100644 --- a/src/greeterconfiguration.h +++ b/src/greeterconfiguration.h @@ -37,6 +37,7 @@ #define CONFIG_KEY_PANEL_POSITION "panel-position" #define CONFIG_KEY_KEYBOARD_POSITION "keyboard-position" #define CONFIG_KEY_A11Y_STATES "a11y-states" +#define CONFIG_KEY_AT_SPI_ENABLED "at-spi-enabled" #define CONFIG_GROUP_MONITOR "monitor:" #define CONFIG_KEY_BACKGROUND "background" diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c index 8a6a0d2..aa1c4cb 100644 --- a/src/lightdm-gtk-greeter.c +++ b/src/lightdm-gtk-greeter.c @@ -2904,7 +2904,14 @@ main (int argc, char **argv) } #ifdef AT_SPI_COMMAND - spawn_line_pid (AT_SPI_COMMAND, G_SPAWN_SEARCH_PATH, NULL); + if (config_has_key (NULL, CONFIG_KEY_AT_SPI_ENABLED) && config_get_bool (NULL, CONFIG_KEY_AT_SPI_ENABLED, TRUE) == FALSE) + { + // AT_SPI is user-disabled + } + else + { + spawn_line_pid (AT_SPI_COMMAND, G_SPAWN_SEARCH_PATH, NULL); + } #endif #ifdef INDICATOR_SERVICES_COMMAND -- cgit v1.2.1