Merge lp:~themuso/lightdm-gtk-greeter/remove-atspi-spawn-code into lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk

Proposed by Luke Yelavich on 2017-06-21
Status: Needs review
Proposed branch: lp:~themuso/lightdm-gtk-greeter/remove-atspi-spawn-code
Merge into: lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk
Diff against target: 68 lines (+2/-24)
2 files modified
configure.ac (+0/-15)
src/lightdm-gtk-greeter.c (+2/-9)
To merge this branch: bzr merge lp:~themuso/lightdm-gtk-greeter/remove-atspi-spawn-code
Reviewer Review Type Date Requested Status
Sean Davis superseded 2017-06-21 Disapprove on 2018-03-01
Review via email: mp+326049@code.launchpad.net

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.

Description of the change

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.

To post a comment you must log in.

Unmerged revisions

362. By Luke Yelavich on 2017-06-21

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2016-10-06 10:26:26 +0000
3+++ configure.ac 2017-06-21 04:35:21 +0000
4@@ -111,21 +111,6 @@
5
6 dnl ###########################################################################
7
8-AC_ARG_ENABLE([at-spi-command],
9- AC_HELP_STRING([--enable-at-spi-command[=command]], [Try to start at-spi service]])
10- AC_HELP_STRING([--disable-at-spi-command], [Do not start at-spi service]),
11- [], [])
12-
13-AS_IF([test "x$enable_at_spi_command" != "xno"],
14-[
15- if test "x$enable_at_spi_command" = "xyes" || test "x$enable_at_spi_command" = "x"; then
16- enable_at_spi_command="/usr/lib/at-spi2-core/at-spi-bus-launcher --launch-immediately"
17- fi
18- AC_DEFINE_UNQUOTED([AT_SPI_COMMAND], ["$enable_at_spi_command"], [Command to start at-spi service])
19-])
20-
21-dnl ###########################################################################
22-
23 AC_ARG_ENABLE([indicator-services-command],
24 AC_HELP_STRING([--enable-indicator-services-command[=command]], [Try to start indicators service]])
25 AC_HELP_STRING([--disable-indicator-services-command], [Do not start indicators service]),
26
27=== modified file 'src/lightdm-gtk-greeter.c'
28--- src/lightdm-gtk-greeter.c 2016-10-06 09:33:35 +0000
29+++ src/lightdm-gtk-greeter.c 2017-06-21 04:35:21 +0000
30@@ -60,7 +60,7 @@
31 /* List of spawned processes */
32 static GSList *pids_to_close = NULL;
33 static GPid spawn_argv_pid (gchar **argv, GSpawnFlags flags, gint *pfd, GError **perror);
34-#if defined(AT_SPI_COMMAND) || defined(INDICATOR_SERVICES_COMMAND)
35+#if defined(INDICATOR_SERVICES_COMMAND)
36 static GPid spawn_line_pid (const gchar *line, GSpawnFlags flags, GError **perror);
37 #endif
38 static void close_pid (GPid pid, gboolean remove);
39@@ -383,7 +383,7 @@
40 return pid;
41 }
42
43-#if defined(AT_SPI_COMMAND) || defined(INDICATOR_SERVICES_COMMAND)
44+#if defined(INDICATOR_SERVICES_COMMAND)
45 static GPid
46 spawn_line_pid (const gchar *line, GSpawnFlags flags, GError **perror)
47 {
48@@ -2645,9 +2645,6 @@
49 /* LP: #1024482 */
50 g_setenv ("GDK_CORE_DEVICE_EVENTS", "1", TRUE);
51
52- /* LP: #1366534 */
53- g_setenv ("NO_AT_BRIDGE", "1", TRUE);
54-
55 /* Initialize i18n */
56 setlocale (LC_ALL, "");
57 bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
58@@ -2775,10 +2772,6 @@
59 g_free (value);
60 }
61
62- #ifdef AT_SPI_COMMAND
63- spawn_line_pid (AT_SPI_COMMAND, G_SPAWN_SEARCH_PATH, NULL);
64- #endif
65-
66 #ifdef INDICATOR_SERVICES_COMMAND
67 spawn_line_pid (INDICATOR_SERVICES_COMMAND, G_SPAWN_SEARCH_PATH, NULL);
68 #endif

Subscribers

People subscribed via source and target branches