Chain glib's SIGCHLD handler from Emacs's (Bug#14474).

* process.c (dummy_handler): New function.
(lib_child_handler): New static var.
(handle_child_signal): Invoke it.
(catch_child_signal): If a library has set up a signal handler,
save it into lib_child_handler.
(init_process_emacs): If using glib and not on Windows, tickle glib's
child-handling code so that it initializes its private SIGCHLD handler.
* syssignal.h (SA_SIGINFO): Default to 0.
* xterm.c (x_term_init): Remove D-bus hack that I installed on May
31; it should no longer be needed now.

1 files changed, 0 insertions, 7 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 7038de7039f..7505aa3936b 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9897,13 +9897,6 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
 
         XSetLocaleModifiers ("");
 
-        /* If D-Bus is not already configured, inhibit D-Bus autolaunch,
-           as autolaunch can mess up Emacs's SIGCHLD handler.
-           FIXME: Rewrite subprocess handlers to use glib's child watchers.
-           See Bug#14474.  */
-        if (! egetenv ("DBUS_SESSION_BUS_ADDRESS"))
-          xputenv ("DBUS_SESSION_BUS_ADDRESS=unix:path=/dev/null");
-
         /* Emacs can only handle core input events, so make sure
            Gtk doesn't use Xinput or Xinput2 extensions.  */
         xputenv ("GDK_CORE_DEVICE_EVENTS=1");