[telepathy-gabble-0.16] telepathy-gabble: Merge with-session-bus. sh changes from telepathy-glib

[Simon McVittie]

Module: telepathy-gabble
Branch: telepathy-gabble-0.16
Commit: f53ea2d64807cf625ca49f6163b77a36a8282f0d
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=f53ea2d64807cf625ca49f6163b77a36a8282f0d

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Apr  4 16:21:33 2013 +0100

Merge with-session-bus.sh changes from telepathy-glib

We also have local changes, which should go "upstream" to telepathy-glib
at some point.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=63119

---

 tests/twisted/tools/with-session-bus.sh |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/tests/twisted/tools/with-session-bus.sh b/tests/twisted/tools/with-session-bus.sh
index 1b8990e..68aec5d 100644
--- a/tests/twisted/tools/with-session-bus.sh
+++ b/tests/twisted/tools/with-session-bus.sh
@@ -81,6 +81,12 @@ if [ -n "$CHECK_TWISTED_VERBOSE" ] || [ -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