From: Colin Walters <walters@verbum.org>
Date: Fri, 30 May 2008 23:58:13 +0000 (-0400)
Subject: Bug 15570: Reset initialized state on dbus_shutdown (Scott James Remnant)
X-Git-Tag: dbus-1.2.3~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd32a72b2f3855ef551d0063ea1e6bea4554be08;p=thirdparty%2Fdbus.git

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 e159dae74..f97cce68f 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 9a1eae876..5a3f399ba 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;
 }