diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-04 14:28:58 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-04 15:15:54 +0100 |
| commit | c768a891d6cd9012c3072b1a8307146e3d41be35 (patch) | |
| tree | 104e0d23300b09440b1515f5513c5f0b4d4731cf | |
| parent | b76abbb76f13fa4aef45c258994b26a51c584c96 (diff) | |
| download | telepathy-glib-c768a891d6cd9012c3072b1a8307146e3d41be35.tar.gz | |
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.)
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=63119
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
| -rwxr-xr-x | tools/with-session-bus.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/with-session-bus.sh b/tools/with-session-bus.sh index b3038cd9e..0afa59321 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`" |