lightdm-gtk-greeter-team team mailing list archive
-
lightdm-gtk-greeter-team team
-
Mailing list archive
-
Message #01255
[Merge] lp:~themuso/lightdm-gtk-greeter/remove-atspi-spawn-code into lp:lightdm-gtk-greeter
Luke Yelavich has proposed merging lp:~themuso/lightdm-gtk-greeter/remove-atspi-spawn-code into lp:lightdm-gtk-greeter.
Commit message:
Remove code to launch and kill at-spi manually
With recent versions of lightdm, at-spi-bus-launcher is unable to completely
clean up after itself if it is loaded by the greeter. Removing this code
allows at-spi to be loaded via Systemd's dbus activation, as recent releases
of at-spi include a user service file. The bus launcher is then able to
properly clean up after itself, and is killed by systemd once the user logs
in.
Requested reviews:
LightDM Gtk+ Greeter Development Team (lightdm-gtk-greeter-team)
Related bugs:
Bug #1670933 in LightDM GTK+ Greeter: "Accessibility partly broken due to X root window being kept from login session."
https://bugs.launchpad.net/lightdm-gtk-greeter/+bug/1670933
For more details, see:
https://code.launchpad.net/~themuso/lightdm-gtk-greeter/remove-atspi-spawn-code/+merge/326049
Remove code to launch and kill at-spi manually
With recent versions of lightdm, at-spi-bus-launcher is unable to completely
clean up after itself if it is loaded by the greeter. Removing this code
allows at-spi to be loaded via Systemd's dbus activation, as recent releases
of at-spi include a user service file. The bus launcher is then able to
properly clean up after itself, and is killed by systemd once the user logs
in.
--
Your team LightDM Gtk+ Greeter Development Team is requested to review the proposed merge of lp:~themuso/lightdm-gtk-greeter/remove-atspi-spawn-code into lp:lightdm-gtk-greeter.
=== modified file 'configure.ac'
--- configure.ac 2016-10-06 10:26:26 +0000
+++ configure.ac 2017-06-21 04:35:21 +0000
@@ -111,21 +111,6 @@
dnl ###########################################################################
-AC_ARG_ENABLE([at-spi-command],
- AC_HELP_STRING([--enable-at-spi-command[=command]], [Try to start at-spi service]])
- AC_HELP_STRING([--disable-at-spi-command], [Do not start at-spi service]),
- [], [])
-
-AS_IF([test "x$enable_at_spi_command" != "xno"],
-[
- if test "x$enable_at_spi_command" = "xyes" || test "x$enable_at_spi_command" = "x"; then
- enable_at_spi_command="/usr/lib/at-spi2-core/at-spi-bus-launcher --launch-immediately"
- fi
- AC_DEFINE_UNQUOTED([AT_SPI_COMMAND], ["$enable_at_spi_command"], [Command to start at-spi service])
-])
-
-dnl ###########################################################################
-
AC_ARG_ENABLE([indicator-services-command],
AC_HELP_STRING([--enable-indicator-services-command[=command]], [Try to start indicators service]])
AC_HELP_STRING([--disable-indicator-services-command], [Do not start indicators service]),
=== modified file 'src/lightdm-gtk-greeter.c'
--- src/lightdm-gtk-greeter.c 2016-10-06 09:33:35 +0000
+++ src/lightdm-gtk-greeter.c 2017-06-21 04:35:21 +0000
@@ -60,7 +60,7 @@
/* List of spawned processes */
static GSList *pids_to_close = NULL;
static GPid spawn_argv_pid (gchar **argv, GSpawnFlags flags, gint *pfd, GError **perror);
-#if defined(AT_SPI_COMMAND) || defined(INDICATOR_SERVICES_COMMAND)
+#if defined(INDICATOR_SERVICES_COMMAND)
static GPid spawn_line_pid (const gchar *line, GSpawnFlags flags, GError **perror);
#endif
static void close_pid (GPid pid, gboolean remove);
@@ -383,7 +383,7 @@
return pid;
}
-#if defined(AT_SPI_COMMAND) || defined(INDICATOR_SERVICES_COMMAND)
+#if defined(INDICATOR_SERVICES_COMMAND)
static GPid
spawn_line_pid (const gchar *line, GSpawnFlags flags, GError **perror)
{
@@ -2645,9 +2645,6 @@
/* LP: #1024482 */
g_setenv ("GDK_CORE_DEVICE_EVENTS", "1", TRUE);
- /* LP: #1366534 */
- g_setenv ("NO_AT_BRIDGE", "1", TRUE);
-
/* Initialize i18n */
setlocale (LC_ALL, "");
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
@@ -2775,10 +2772,6 @@
g_free (value);
}
- #ifdef AT_SPI_COMMAND
- spawn_line_pid (AT_SPI_COMMAND, G_SPAWN_SEARCH_PATH, NULL);
- #endif
-
#ifdef INDICATOR_SERVICES_COMMAND
spawn_line_pid (INDICATOR_SERVICES_COMMAND, G_SPAWN_SEARCH_PATH, NULL);
#endif
References