From 8ad12dd43550979a6135e62cc2b131c4473f4fc4 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 4 Apr 2013 14:28:58 +0100 Subject: [PATCH] with-session-bus.sh: clear DBUS_STARTER_* telepathy-glib prefers to use DBUS_BUS_STARTER, for the benefit of Telepathy components that are (or might be) service-activatable. The actual terminal part of gnome-terminal 3.8 is an activatable service, so when run from there, we pick up the real session bus' address via DBUS_STARTER_ADDRESS. We don't want that. (Yes, it's DBUS_STARTER_ADDRESS, not DBUS_STARTER_BUS_ADDRESS. The reference implementation and the D-Bus Specification both say so.) --- tools/with-session-bus.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/with-session-bus.sh b/tools/with-session-bus.sh index b3038cd..0afa593 100755 --- a/tools/with-session-bus.sh +++ b/tools/with-session-bus.sh @@ -77,6 +77,12 @@ if [ -n "$VERBOSE_TESTS" ]; then fi e=0 + +# These might be non-null when run from e.g. gnome-terminal 3.8, which uses +# an activatable service for its windows; we don't want to inherit them either +unset DBUS_STARTER_ADDRESS +unset DBUS_STARTER_BUS_TYPE + DBUS_SESSION_BUS_ADDRESS="`cat $me-$$.address`" export DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID="`cat $me-$$.pid`" -- 1.7.10.4