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

Proposed by Luke Yelavich
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 Disapprove
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.
Revision history for this message
Sean Davis (bluesabre) wrote :
review: Disapprove (superseded)

Unmerged revisions

362. By Luke Yelavich

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
=== 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 @@
111111
112dnl ###########################################################################112dnl ###########################################################################
113113
114AC_ARG_ENABLE([at-spi-command],
115 AC_HELP_STRING([--enable-at-spi-command[=command]], [Try to start at-spi service]])
116 AC_HELP_STRING([--disable-at-spi-command], [Do not start at-spi service]),
117 [], [])
118
119AS_IF([test "x$enable_at_spi_command" != "xno"],
120[
121 if test "x$enable_at_spi_command" = "xyes" || test "x$enable_at_spi_command" = "x"; then
122 enable_at_spi_command="/usr/lib/at-spi2-core/at-spi-bus-launcher --launch-immediately"
123 fi
124 AC_DEFINE_UNQUOTED([AT_SPI_COMMAND], ["$enable_at_spi_command"], [Command to start at-spi service])
125])
126
127dnl ###########################################################################
128
129AC_ARG_ENABLE([indicator-services-command],114AC_ARG_ENABLE([indicator-services-command],
130 AC_HELP_STRING([--enable-indicator-services-command[=command]], [Try to start indicators service]])115 AC_HELP_STRING([--enable-indicator-services-command[=command]], [Try to start indicators service]])
131 AC_HELP_STRING([--disable-indicator-services-command], [Do not start indicators service]),116 AC_HELP_STRING([--disable-indicator-services-command], [Do not start indicators service]),
132117
=== 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 @@
60/* List of spawned processes */60/* List of spawned processes */
61static GSList *pids_to_close = NULL;61static GSList *pids_to_close = NULL;
62static GPid spawn_argv_pid (gchar **argv, GSpawnFlags flags, gint *pfd, GError **perror);62static GPid spawn_argv_pid (gchar **argv, GSpawnFlags flags, gint *pfd, GError **perror);
63#if defined(AT_SPI_COMMAND) || defined(INDICATOR_SERVICES_COMMAND)63#if defined(INDICATOR_SERVICES_COMMAND)
64static GPid spawn_line_pid (const gchar *line, GSpawnFlags flags, GError **perror);64static GPid spawn_line_pid (const gchar *line, GSpawnFlags flags, GError **perror);
65#endif65#endif
66static void close_pid (GPid pid, gboolean remove);66static void close_pid (GPid pid, gboolean remove);
@@ -383,7 +383,7 @@
383 return pid;383 return pid;
384}384}
385385
386#if defined(AT_SPI_COMMAND) || defined(INDICATOR_SERVICES_COMMAND)386#if defined(INDICATOR_SERVICES_COMMAND)
387static GPid387static GPid
388spawn_line_pid (const gchar *line, GSpawnFlags flags, GError **perror)388spawn_line_pid (const gchar *line, GSpawnFlags flags, GError **perror)
389{389{
@@ -2645,9 +2645,6 @@
2645 /* LP: #1024482 */2645 /* LP: #1024482 */
2646 g_setenv ("GDK_CORE_DEVICE_EVENTS", "1", TRUE);2646 g_setenv ("GDK_CORE_DEVICE_EVENTS", "1", TRUE);
26472647
2648 /* LP: #1366534 */
2649 g_setenv ("NO_AT_BRIDGE", "1", TRUE);
2650
2651 /* Initialize i18n */2648 /* Initialize i18n */
2652 setlocale (LC_ALL, "");2649 setlocale (LC_ALL, "");
2653 bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);2650 bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
@@ -2775,10 +2772,6 @@
2775 g_free (value);2772 g_free (value);
2776 }2773 }
27772774
2778 #ifdef AT_SPI_COMMAND
2779 spawn_line_pid (AT_SPI_COMMAND, G_SPAWN_SEARCH_PATH, NULL);
2780 #endif
2781
2782 #ifdef INDICATOR_SERVICES_COMMAND2775 #ifdef INDICATOR_SERVICES_COMMAND
2783 spawn_line_pid (INDICATOR_SERVICES_COMMAND, G_SPAWN_SEARCH_PATH, NULL);2776 spawn_line_pid (INDICATOR_SERVICES_COMMAND, G_SPAWN_SEARCH_PATH, NULL);
2784 #endif2777 #endif

Subscribers

People subscribed via source and target branches