From 7caf646fdf595946eb28202e2df3f847d28c7151 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Wed, 9 Apr 2003 22:15:05 +0000 Subject: 2003-04-09 Havoc Pennington * test/test-utils.c: use dispatch status function to fix this up * bus/connection.c (connection_watch_callback): don't dispatch from here (connection_timeout_callback): don't dispatch from here (bus_connections_setup_connection): set the dispatch status function (bus_connection_disconnected): unset it * dbus/dbus-mainloop.c (_dbus_loop_queue_dispatch): new function used to add a connection to be dispatched (_dbus_loop_iterate): do the dispatching at the end of each iteration * dbus/dbus-connection.c (dbus_connection_set_dispatch_status_function): new function allowing us to fix up main loop usage (_dbus_connection_last_unref): free all the various function user data (dbus_connection_dispatch): call the DispatchStatusFunction whenever this function returns (dbus_connection_handle_watch): call DispatchStatusFunction (dbus_connection_send_with_reply_and_block): call DispatchStatusFunction (reply_handler_timeout): call DispatchStatusFunction (dbus_connection_flush): call DispatchStatusFunction --- dbus/dbus-mainloop.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'dbus/dbus-mainloop.h') diff --git a/dbus/dbus-mainloop.h b/dbus/dbus-mainloop.h index bca4317d..7aaf9de0 100644 --- a/dbus/dbus-mainloop.h +++ b/dbus/dbus-mainloop.h @@ -55,6 +55,10 @@ void _dbus_loop_remove_timeout (DBusLoop *loop, DBusTimeout *timeout, DBusTimeoutFunction function, void *data); + +dbus_bool_t _dbus_loop_queue_dispatch (DBusLoop *loop, + DBusConnection *connection); + void _dbus_loop_run (DBusLoop *loop); void _dbus_loop_quit (DBusLoop *loop); dbus_bool_t _dbus_loop_iterate (DBusLoop *loop, -- cgit