rpms/GConf2/devel GConf2.spec, 1.83, 1.84 gconf-2.22.0-use-dbus.patch, 1.1, 1.2

[Ray Strode (rstrode)]

Author: rstrode

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

Modified Files:
	GConf2.spec gconf-2.22.0-use-dbus.patch 
Log Message:
- If the session bus isn't running, don't autolaunch it unless
  we also want to autostart gconfd.



Index: GConf2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- GConf2.spec	8 May 2008 21:33:00 -0000	1.83
+++ GConf2.spec	12 May 2008 19:07:25 -0000	1.84
@@ -7,7 +7,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.22.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.22/GConf-%{version}.tar.bz2
@@ -160,6 +160,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon May 12 2008 Ray Strode <rstrode at redhat.com> - 2.22.0-6
+- If the session bus isn't running, don't autolaunch it unless
+  we also want to autostart gconfd.
+
 * Thu May 8 2008 Ray Strode <rstrode at redhat.com> - 2.22.0-5
 - Tie gconf to session bus.  This means it will exit when the session
   exits and won't leave /tmp/gconf-$USER DoS possibilities

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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gconf-2.22.0-use-dbus.patch	8 May 2008 21:33:00 -0000	1.1
+++ gconf-2.22.0-use-dbus.patch	12 May 2008 19:07:25 -0000	1.2
@@ -745,3 +745,22 @@
 +[D-BUS Service]
 +Name=org.gnome.GConf
 +Exec=@libexecdir@/gconfd-2
+--- GConf-2.22.0/gconf/gconf-internals.c	(revision 2592)
++++ GConf-2.22.0/gconf/gconf-internals.c	(working copy)
+@@ -2429,6 +2429,16 @@ get_ior (gboolean start_if_not_found,
+         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);
+