summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS9
-rwxr-xr-xtools/with-session-bus.sh6
2 files changed, 15 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 2c0555718..bb61603ad 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,15 @@
+telepathy-glib 0.21.1 (UNRELEASED)
+==================================
+
+Fixes:
+
+• Isolate regression tests better (fd.o #63119, Simon)
+
telepathy-glib 0.21.0 (2013-04-03)
==================================
+The "if only it was JS code" release.
+
This starts a new development branch.
Enhancements:
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`"