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.

diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c
index e159dae74290aae5866444a4aa9d462a7e75ff04..f97cce68f590de83dee30d4e97957ba781022907 100644 (file)
--- 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 9a1eae876acfdbb9dc39b69cc2e42c3d737d2bd6..5a3f399ba96eabec1e31b246d74c591b70982dd3 100644 (file)
--- 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;
 }