[gconf] fix early bailout when using launchd on Mac OS X

[Ray Strode <halfline src gnome org>]

commit 44f85b6119149e2c4217b290bae489cf5fb290ad
Author: Simon Wagner <wagner sim88 web de>
Date:   Tue Oct 9 19:20:45 2012 +0200

    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

 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 06ef08d..1b4452a 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,