From cd4f495d9023d8d02b84c278a6a4d9a2240bbc09 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 21 May 2008 16:47:56 +0000 Subject: [PATCH] - Don't ever try to autolaunch a bus if DISPLAY is unset --- GConf2.spec | 5 ++++- gconf-2.22.0-use-dbus.patch | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/GConf2.spec b/GConf2.spec index 207169b..ac10e7c 100644 --- a/GConf2.spec +++ b/GConf2.spec @@ -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 @@ fi %{_libdir}/pkgconfig/* %changelog +* Wed May 21 2008 Ray Strode - 2.22.0-9 +- Don't ever try to autolaunch a bus if DISPLAY is unset + * Wed May 21 2008 Ray Strode - 2.22.0-8 - If the session bus isn't running, assume local client side access to the database (bug 446703) diff --git a/gconf-2.22.0-use-dbus.patch b/gconf-2.22.0-use-dbus.patch index 6b731c6..41a1393 100644 --- a/gconf-2.22.0-use-dbus.patch +++ b/gconf-2.22.0-use-dbus.patch @@ -754,13 +754,13 @@ diff -up /dev/null GConf-2.22.0/gconf/org.gnome.GConf.service.in + /* 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);