From 06fbdb04d5001eaf9abadb872185d7b3e1593e08 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Mon, 28 Oct 2013 14:54:22 -0400 Subject: [PATCH] GTestDBus: Make sure only DBUS_SESSION_BUS_ADDRESS is set by default g_test_dbus_unset() now also unset DBUS_STARTER_ADDRESS and DBUS_STARTER_BUS_TYPE. https://bugzilla.gnome.org/show_bug.cgi?id=697348 --- gio/gtestdbus.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gio/gtestdbus.c b/gio/gtestdbus.c index 1c24949ab..92d871125 100644 --- a/gio/gtestdbus.c +++ b/gio/gtestdbus.c @@ -758,6 +758,7 @@ g_test_dbus_up (GTestDBus *self) start_daemon (self); + g_test_dbus_unset (); g_setenv ("DBUS_SESSION_BUS_ADDRESS", self->priv->bus_address, TRUE); self->priv->up = TRUE; } @@ -811,7 +812,7 @@ g_test_dbus_down (GTestDBus *self) if (connection != NULL) _g_object_unref_and_wait_weak_notify (connection); - g_unsetenv ("DBUS_SESSION_BUS_ADDRESS"); + g_test_dbus_unset (); self->priv->up = FALSE; } @@ -830,4 +831,6 @@ g_test_dbus_unset (void) { g_unsetenv ("DISPLAY"); g_unsetenv ("DBUS_SESSION_BUS_ADDRESS"); + g_unsetenv ("DBUS_STARTER_ADDRESS"); + g_unsetenv ("DBUS_STARTER_BUS_TYPE"); } -- 2.34.1