Commit 44f85b61 authored by Simon Wagner's avatar Simon Wagner Committed by Ray Strode

fix early bailout when using launchd on Mac OS X

we did not check if DBUS_LAUNCHD_SESSION_BUS_SOCKET
was set. If this environment variable exists, launchd
will start the gconf daemon and we won't need a
X server to start the daemon.

https://bugzilla.gnome.org/show_bug.cgi?id=685509
parent 8c0f2d3c
......@@ -2475,7 +2475,7 @@ get_ior (gboolean start_if_not_found,
/* if the bus isn't running and we don't want to start gconfd then
* we don't want to autolaunch the bus either, so bail early.
*/
if (g_getenv ("DBUS_SESSION_BUS_ADDRESS") == NULL &&
if ((g_getenv ("DBUS_SESSION_BUS_ADDRESS") == NULL && g_getenv ("DBUS_LAUNCHD_SESSION_BUS_SOCKET") == NULL ) &&
(!start_if_not_found || g_getenv ("DISPLAY") == NULL)) {
if (failure_log)
g_string_append_printf (failure_log,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment