diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-03-16 20:16:47 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-03-16 20:16:47 +0000 |
| commit | ebb57e719c32becd95a1efe3dd269c21e5a011b6 (patch) | |
| tree | 1712e557855a60576828b45683505d329631a462 /bus/dispatch.c | |
| parent | 021305e5686fc4847fec942922d2115ae5c9c2bb (diff) | |
2003-03-16 Havoc Pennington <hp@pobox.com>
* dbus/dbus-string.c (_dbus_string_validate_utf8): oops, unbreak
this. always run the test suite before commit...
* bus/*: adapt to DBusConnection API changes
* glib/dbus-gmain.c: adapt to DBusConnection API changes,
requires renaming stuff to avoid dbus_connection_dispatch name
conflict.
* dbus/dbus-transport.c (_dbus_transport_queue_messages): new
function
* dbus/dbus-message.c (_dbus_message_loader_queue_messages):
separate from _dbus_message_loader_return_buffer()
* dbus/dbus-connection.c (dbus_connection_get_n_messages): remove
this, because it's now always broken to use; the number of
messages in queue vs. the number still buffered by the message
loader is undefined/meaningless. Should use
dbus_connection_get_dispatch_state().
(dbus_connection_dispatch): rename from
dbus_connection_dispatch_message
Diffstat (limited to 'bus/dispatch.c')
| -rw-r--r-- | bus/dispatch.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bus/dispatch.c b/bus/dispatch.c index 0fe4be19..3c96d704 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -514,7 +514,7 @@ kill_client_connection (BusContext *context, _dbus_assert (bus_test_client_listed (connection)); /* Run disconnect handler in test.c */ - if (dbus_connection_dispatch_message (connection)) + if (bus_connection_dispatch_one_message (connection)) _dbus_assert_not_reached ("something received on connection being killed other than the disconnect"); _dbus_assert (!dbus_connection_get_is_connected (connection)); @@ -859,7 +859,7 @@ check_hello_connection (BusContext *context) dbus_connection_ref (connection); dbus_connection_disconnect (connection); /* dispatching disconnect handler will unref once */ - if (dbus_connection_dispatch_message (connection)) + if (bus_connection_dispatch_one_message (connection)) _dbus_assert_not_reached ("message other than disconnect dispatched after failure to register"); dbus_connection_unref (connection); _dbus_assert (!bus_test_client_listed (connection)); @@ -967,19 +967,19 @@ bus_dispatch_test (const DBusString *test_data_dir) check_hello_connection); dbus_connection_disconnect (foo); - if (dbus_connection_dispatch_message (foo)) + if (bus_connection_dispatch_one_message (foo)) _dbus_assert_not_reached ("extra message in queue"); dbus_connection_unref (foo); _dbus_assert (!bus_test_client_listed (foo)); dbus_connection_disconnect (bar); - if (dbus_connection_dispatch_message (bar)) + if (bus_connection_dispatch_one_message (bar)) _dbus_assert_not_reached ("extra message in queue"); dbus_connection_unref (bar); _dbus_assert (!bus_test_client_listed (bar)); dbus_connection_disconnect (baz); - if (dbus_connection_dispatch_message (baz)) + if (bus_connection_dispatch_one_message (baz)) _dbus_assert_not_reached ("extra message in queue"); dbus_connection_unref (baz); _dbus_assert (!bus_test_client_listed (baz)); |