diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-04 15:59:26 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-04 15:59:26 +0100 |
commit | 5d5c11908eb9b6e91455416d96e41a7a636c56e5 (patch) | |
tree | 965075506be95e86edf7c29382927e811b942a72 /tools | |
parent | d3e062e6c771b611af9c35120a897117e8149825 (diff) | |
parent | 0b008a263cfe39d5fcb128d9076c22dfec8905a7 (diff) | |
download | telepathy-glib-5d5c11908eb9b6e91455416d96e41a7a636c56e5.tar.gz |
Merge branch 'telepathy-glib-0.20' and update NEWS
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'tools')
-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`" |