diff options
| author | Colin Walters <walters@verbum.org> | 2008-05-30 19:58:13 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2008-05-30 19:58:13 -0400 |
| commit | fd32a72b2f3855ef551d0063ea1e6bea4554be08 (patch) | |
| tree | 929a39306a74efeaa83039adc9b0625a359ac84f | |
| parent | 5e359834f28b0580e7b79a057614d4e3592709ac (diff) | |
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.
| -rw-r--r-- | dbus/dbus-bus.c | 2 | ||||
| -rw-r--r-- | 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; } |