telepathy-glib: with-session-bus.sh: clear DBUS_STARTER_*

[Simon McVittie]

Module: telepathy-glib
Branch: master
Commit: c768a891d6cd9012c3072b1a8307146e3d41be35
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=c768a891d6cd9012c3072b1a8307146e3d41be35

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Apr  4 14:28:58 2013 +0100

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 at collabora.co.uk>
Reviewed-by: Xavier Claessens <xavier.claessens at collabora.co.uk>

---

 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`"