diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-23 16:05:45 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-25 11:00:48 +0200 |
| commit | 4a9fdeb64bc87f09e44ecc0f9c6acaea8bf11f20 (patch) | |
| tree | 41bb3585a34125aaa26408de78da312226a0bc7c /tools/with-session-bus.sh | |
| parent | 15f9b0e7259c46747326758d62c5a9ecb6ce3af2 (diff) | |
| download | telepathy-logger-4a9fdeb64bc87f09e44ecc0f9c6acaea8bf11f20.tar.gz | |
sync tools/ with tp-glib master
Needed to stop using deprecated API in generated code.
https://bugs.freedesktop.org/show_bug.cgi?id=69797
Diffstat (limited to 'tools/with-session-bus.sh')
| -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 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`" |