diff options
| author | Simon Wagner <wagner.sim88@web.de> | 2012-10-09 19:20:45 +0200 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2012-10-09 15:21:44 -0400 |
| commit | 44f85b6119149e2c4217b290bae489cf5fb290ad (patch) | |
| tree | d8ef6b946ddd8f6b026a2aab9ab602415a0bce0f | |
| parent | 8c0f2d3c33eb55414a7f97e6ebec0255527ff84e (diff) | |
| download | gconf-44f85b6119149e2c4217b290bae489cf5fb290ad.tar.gz | |
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
| -rw-r--r-- | gconf/gconf-internals.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c index 06ef08da..1b4452ac 100644 --- a/gconf/gconf-internals.c +++ b/gconf/gconf-internals.c @@ -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, |