[Emacs-diffs] /srv/bzr/emacs/trunk r112795: Don't let D-bus autolaunch mess up SIGCHLD handling.

[Paul Eggert]

------------------------------------------------------------
revno: 112795
fixes bug: http://debbugs.gnu.org/14474
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2013-05-30 18:41:52 -0700
message:
  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.
modified:
  src/ChangeLog
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-05-31 01:31:10 +0000
+++ b/src/ChangeLog     2013-05-31 01:41:52 +0000
@@ -1,5 +1,9 @@
 2013-05-31  Paul Eggert  <address@hidden>
 
+       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  <address@hidden>

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2013-05-09 14:49:56 +0000
+++ b/src/xterm.c       2013-05-31 01:41:52 +0000
@@ -9897,6 +9897,13 @@
 
         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");