luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-16 04:28:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

GTestDBus: Make sure only DBUS_SESSION_BUS_ADDRESS is set by default

Browse Source 
g_test_dbus_unset() now also unset DBUS_STARTER_ADDRESS and
DBUS_STARTER_BUS_TYPE.

https://bugzilla.gnome.org/show_bug.cgi?id=697348
This commit is contained in:
Xavier Claessens 2013-10-28 14:54:22 -04:00
parent 940fa98290
commit 06fbdb04d5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gio/gtestdbus.c
View File

@ -758,6 +758,7 @@ g_test_dbus_up (GTestDBus *self)
start_daemon (self); start_daemon (self);
g_test_dbus_unset ();
g_setenv ("DBUS_SESSION_BUS_ADDRESS", self->priv->bus_address, TRUE); g_setenv ("DBUS_SESSION_BUS_ADDRESS", self->priv->bus_address, TRUE);
self->priv->up = TRUE; self->priv->up = TRUE;
} }
@ -811,7 +812,7 @@ g_test_dbus_down (GTestDBus *self)
if (connection != NULL) if (connection != NULL)
_g_object_unref_and_wait_weak_notify (connection); _g_object_unref_and_wait_weak_notify (connection);
g_unsetenv ("DBUS_SESSION_BUS_ADDRESS"); g_test_dbus_unset ();
self->priv->up = FALSE; self->priv->up = FALSE;
} }
@ -830,4 +831,6 @@ g_test_dbus_unset (void)
{ {
g_unsetenv ("DISPLAY"); g_unsetenv ("DISPLAY");
g_unsetenv ("DBUS_SESSION_BUS_ADDRESS"); g_unsetenv ("DBUS_SESSION_BUS_ADDRESS");
g_unsetenv ("DBUS_STARTER_ADDRESS");
g_unsetenv ("DBUS_STARTER_BUS_TYPE");
} }