gconf r2593 - in trunk: . gconf

[halfline svn gnome org]

Author: halfline
Date: Mon May 12 19:04:23 2008
New Revision: 2593
URL: http://svn.gnome.org/viewvc/gconf?rev=2593&view=rev

Log:
2008-05-12  Ray Strode  <rstrode redhat com>

	* gconf/gconf-internals.c (get_ior):
	Don't auto launch session bus if we aren't going to
	auto start gconfd.


Modified:
   trunk/ChangeLog
   trunk/gconf/gconf-internals.c

Modified: trunk/gconf/gconf-internals.c
==============================================================================
--- trunk/gconf/gconf-internals.c	(original)
+++ trunk/gconf/gconf-internals.c	Mon May 12 19:04:23 2008
@@ -2429,6 +2429,16 @@
         DBusError bus_error;
         char *ior;
 
+        /* 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 && !start_if_not_found) {
+                if (failure_log)
+                    g_string_append_printf (failure_log,
+                                            _("Not running within active session"));
+                return NULL;
+        }
+
         dbus_error_init (&bus_error);
         connection = dbus_bus_get (DBUS_BUS_SESSION, &bus_error);