summaryrefslogtreecommitdiffstats
path: root/bus/test.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-04-27 06:25:42 +0000
committerHavoc Pennington <hp@redhat.com>2003-04-27 06:25:42 +0000
commite8d396efef695b9868b0112c4a6266c97678fa8a (patch)
treee6702685d70c2dd65c6b301de8904a672ef7b419 /bus/test.c
parentb3bd48edfc1aab0a9dc64bfa4c380d845d218e73 (diff)
2003-04-27 Havoc Pennington <hp@pobox.com>
Unbreak my code... * dbus/dbus-transport.c (_dbus_transport_get_dispatch_status): report correct status if we finish processing authentication inside this function. * bus/activation.c (try_send_activation_failure): use bus_transaction_send_error_reply * bus/connection.c (bus_connection_get_groups): return an error explaining the problem * bus/bus.c (bus_context_check_security_policy): implement restriction here that inactive connections can only send the hello message. Also, allow bus driver to send anything to any recipient. * bus/connection.c (bus_connection_complete): create the BusClientPolicy here instead of on-demand. (bus_connection_get_policy): don't return an error * dbus/dbus-message.c (dbus_message_new_error_reply): allow NULL sender field in message being replied to * bus/bus.c (bus_context_check_security_policy): fix silly typo causing it to return FALSE always * bus/policy.c (bus_client_policy_check_can_send): fix bug where we checked sender rather than destination
Diffstat (limited to 'bus/test.c')
-rw-r--r--bus/test.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/bus/test.c b/bus/test.c
index 65922213..012d1d0e 100644
--- a/bus/test.c
+++ b/bus/test.c
@@ -304,7 +304,11 @@ bus_test_run_clients_loop (dbus_bool_t block_once)
_dbus_loop_dispatch (client_loop);
/* Do one blocking wait, since we're expecting data */
- _dbus_loop_iterate (client_loop, block_once);
+ if (block_once)
+ {
+ _dbus_verbose ("---> blocking on \"client side\"\n");
+ _dbus_loop_iterate (client_loop, TRUE);
+ }
/* Then mop everything up */
while (_dbus_loop_iterate (client_loop, FALSE))
@@ -321,7 +325,11 @@ bus_test_run_bus_loop (BusContext *context,
_dbus_loop_dispatch (bus_context_get_loop (context));
/* Do one blocking wait, since we're expecting data */
- _dbus_loop_iterate (bus_context_get_loop (context), block_once);
+ if (block_once)
+ {
+ _dbus_verbose ("---> blocking on \"server side\"\n");
+ _dbus_loop_iterate (bus_context_get_loop (context), TRUE);
+ }
/* Then mop everything up */
while (_dbus_loop_iterate (bus_context_get_loop (context), FALSE))