From fd32a72b2f3855ef551d0063ea1e6bea4554be08 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 30 May 2008 19:58:13 -0400 Subject: Bug 15570: Reset initialized state on dbus_shutdown (Scott James Remnant) * dbus/dbus-bus.c (addresses_shutdown_func): Reset initialized back to FALSE after cleaning up the address list so that it will be reinitialized again if D-Bus is used after dbus_shutdown() * test/name-test/test-privserver-client.c: Uncomment part of test which should now pass. --- dbus/dbus-bus.c | 2 ++ test/name-test/test-privserver-client.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c index e159dae7..f97cce68 100644 --- a/dbus/dbus-bus.c +++ b/dbus/dbus-bus.c @@ -124,6 +124,8 @@ addresses_shutdown_func (void *data) } activation_bus_type = DBUS_BUS_STARTER; + + initialized = FALSE; } static dbus_bool_t diff --git a/test/name-test/test-privserver-client.c b/test/name-test/test-privserver-client.c index 9a1eae87..5a3f399b 100644 --- a/test/name-test/test-privserver-client.c +++ b/test/name-test/test-privserver-client.c @@ -92,11 +92,9 @@ main (int argc, char *argv[]) dbus_shutdown (); - /* open_shutdown_private_connection (); dbus_shutdown (); - */ return 0; } -- cgit