summaryrefslogtreecommitdiffstats
path: root/bus
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2006-09-08 17:21:37 +0000
committerJohn (J5) Palmieri <johnp@redhat.com>2006-09-08 17:21:37 +0000
commitf61a63cefb4c931636b43ffa8f61ad3dd45d7b86 (patch)
treeb5ecbdbaa40fb45da6177c63f9d7b4736e5867d4 /bus
parentb4d571bba305f05810e77e7b1309524d3bf53f3f (diff)
* bus/test-main.c (main): Initialize threading during tests
* dbus/dbus-connection.c (_dbus_connection_new_for_transport): Unlock connection on error (generate_local_error_message): static method for generating an error message when we don't have a message to reply to (_dbus_connection_block_pending_call): Send a disconnect error instead of just a timeout (NULL) when the bus gets disconnected while blocking for a reply.
Diffstat (limited to 'bus')
-rw-r--r--bus/test-main.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/bus/test-main.c b/bus/test-main.c
index 9c52fdbf..f7bb0cc1 100644
--- a/bus/test-main.c
+++ b/bus/test-main.c
@@ -93,11 +93,8 @@ main (int argc, char **argv)
_dbus_string_init_const (&test_data_dir, dir);
-#if 0
- /* FIXME 1.0 this is disabled because of thread bugs that need fixing... */
if (!_dbus_threads_init_debug ())
die ("initializing debug threads");
-#endif
test_pre_hook ();
printf ("%s: Running expire list test\n", argv[0]);