From 9e4450872a6861bd93a01dabe14d2d16f6c84d3f Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Wed, 16 Feb 2005 04:37:27 +0000 Subject: 2005-02-15 Havoc Pennington * dbus/dbus-connection.c (dbus_connection_dispatch): always complete a pending call, don't run filters first. * glib/dbus-gproxy.c (dbus_g_proxy_end_call): change to use dbus_pending_call_steal_reply * dbus/dbus-pending-call.c (dbus_pending_call_block): just call _dbus_connection_block_pending_call (dbus_pending_call_get_reply): change to steal_reply and return a ref * dbus/dbus-connection.c (dbus_connection_send_with_reply_and_block): port to work in terms of DBusPendingCall (_dbus_connection_block_pending_call): replace block_for_reply with this --- dbus/dbus-connection-internal.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'dbus/dbus-connection-internal.h') diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h index 57e6fb0d..c8995706 100644 --- a/dbus/dbus-connection-internal.h +++ b/dbus/dbus-connection-internal.h @@ -84,9 +84,7 @@ DBusPendingCall* _dbus_pending_call_new (DBusConnection void _dbus_pending_call_notify (DBusPendingCall *pending); void _dbus_connection_remove_pending_call (DBusConnection *connection, DBusPendingCall *pending); -DBusMessage* _dbus_connection_block_for_reply (DBusConnection *connection, - dbus_uint32_t client_serial, - int timeout_milliseconds); +void _dbus_connection_block_pending_call (DBusPendingCall *pending); void _dbus_pending_call_complete_and_unlock (DBusPendingCall *pending, DBusMessage *message); dbus_bool_t _dbus_connection_send_and_unlock (DBusConnection *connection, -- cgit