Don't let D-bus autolaunch mess up SIGCHLD handling.

* xterm.c (x_term_init): Inhibit D-Bus autolaunch if D-Bus is
not already configured.

Fixes: debbugs:14474

src/ChangeLog

 2013-05-31  Paul Eggert  <eggert@cs.ucla.edu>
 
+	Don't let D-bus autolaunch mess up SIGCHLD handling (Bug#14474).
+	* xterm.c (x_term_init): Inhibit D-Bus autolaunch if D-Bus is
+	not already configured.
+
 	* fileio.c (Finsert_file_contents): Remove unused local (Bug#8447).
 
 2013-05-29  Eli Zaretskii  <eliz@gnu.org>

src/xterm.c

@@ -9897,6 +9897,13 @@ 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");