rpms/GConf2/devel GConf2.spec, 1.86, 1.87 gconf-2.22.0-use-dbus.patch, 1.3, 1.4

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/GConf2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8978

Modified Files:
	GConf2.spec gconf-2.22.0-use-dbus.patch 
Log Message:
- Don't ever try to autolaunch a bus if DISPLAY is unset



Index: GConf2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- GConf2.spec	21 May 2008 14:15:20 -0000	1.86
+++ GConf2.spec	21 May 2008 16:47:56 -0000	1.87
@@ -7,7 +7,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.22.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.22/GConf-%{version}.tar.bz2
@@ -160,6 +160,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed May 21 2008 Ray Strode <rstrode at redhat.com> - 2.22.0-9
+- Don't ever try to autolaunch a bus if DISPLAY is unset
+
 * Wed May 21 2008 Ray Strode <rstrode at redhat.com> - 2.22.0-8
 - If the session bus isn't running, assume local client side
   access to the database (bug 446703)

gconf-2.22.0-use-dbus.patch:

Index: gconf-2.22.0-use-dbus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/gconf-2.22.0-use-dbus.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gconf-2.22.0-use-dbus.patch	21 May 2008 14:15:20 -0000	1.3
+++ gconf-2.22.0-use-dbus.patch	21 May 2008 16:47:56 -0000	1.4
@@ -754,13 +754,13 @@
 +        /* 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 (g_getenv ("DBUS_SESSION_BUS_ADDRESS") == NULL
++            && (!start_if_not_found || g_getenv ("DISPLAY") == NULL)) {
 +                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);