[next] telepathy-glib: start_dbus_session: rely on g_test_dbus_unset() to unset starter bus

[Simon McVittie]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Mar 18 12:10:03 2014 +0000

start_dbus_session: rely on g_test_dbus_unset() to unset starter bus

It does since GLib 2.39.1.

Reviewed-by: Guillaume Desmottes

---

 tests/lib/util.c |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/lib/util.c b/tests/lib/util.c
index 3efd3fb..86ed0d6 100644
--- a/tests/lib/util.c
+++ b/tests/lib/util.c
@@ -89,11 +89,6 @@ start_dbus_session (void)
 
   g_test_dbus_unset ();
 
-  /* GLib 2.36 does not unset STARTER env variables but tp-glib are using them.
-   * See https://bugzilla.gnome.org/show_bug.cgi?id=697348 */
-  g_unsetenv ("DBUS_STARTER_ADDRESS");
-  g_unsetenv ("DBUS_STARTER_BUS_TYPE");
-
   test_dbus = g_test_dbus_new (G_TEST_DBUS_NONE);
   g_test_dbus_add_service_dir (test_dbus, g_getenv ("TP_TESTS_SERVICES_DIR"));
   g_test_dbus_up (test_dbus);