dbus-launch problem in 1.1.4

[Matthias Clasen]

Hey, I just wasted a day on debugging a dbus-launch problem, the
symptoms of which you can see in this bug:
https://bugzilla.redhat.com/show_bug.cgi?id=430412

dbus-launch is called with --exit-with-session, but the babysitter
dies early on, so the session bus never gets cleaned up when the X
server goes away.

Reverting the last big commit by Sjoerd Simons makes this problem go away.
(This one: http://gitweb.freedesktop.org/?p=dbus/dbus.git;a=commitdiff;h=ed47b4502b4b6bc1cabd99be3c3b63859be72a7c;hp=bef4260ad58bc9eb75e2e1a52ad9b49bc3c70fa5)

Looking closer at the patch, it is enough to comment out this one hunk:

+   else if (read_machine_uuid_if_needed())
+    {
+      x11_init();

I assume what is happening here is that this causes the original
dbus-launch process to open the X connection, which then gets
inherited by the babysitter.

This should be sorted out before the 1.2 release.


Matthias