From dec1fa3bd5f106ba5b2c749372231e3dd4bf9e7b Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Tue, 28 Jan 2003 14:26:49 +0000 Subject: 2003-01-28 Anders Carlsson * dbus/dbus-connection-internal.h: * dbus/dbus-connection.c: (_dbus_connection_add_timeout), (_dbus_connection_remove_timeout): Add functions for adding and removing timeouts. * dbus/dbus-message.c: (dbus_message_new_from_message): Add new function that takes a message and creates an exact copy of it, but with the refcount set to 1. (check_message_handling): Fix build error. * dbus/dbus-server-protected.h: * dbus/dbus-server.c: (_dbus_server_init_base), (_dbus_server_finalize_base), (_dbus_server_add_timeout), (dbus_server_set_timeout_functions): (_dbus_server_remove_timeout): New functions so that a server can add and remove timeouts. (dbus_server_listen): Add commented out call to dbus_server_debug_new. * dbus/dbus-timeout.c: (_dbus_timeout_new): Actually set the handler, doh. * dbus/dbus-transport.c: (_dbus_transport_open): Add commented out call to dbus_transport_debug_client_new. * dbus/Makefile.am: Add dbus-transport-debug.[ch] and dbus-server-debug.[ch] --- dbus/dbus-server-protected.h | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'dbus/dbus-server-protected.h') diff --git a/dbus/dbus-server-protected.h b/dbus/dbus-server-protected.h index 5e1ad55e..f155bbb8 100644 --- a/dbus/dbus-server-protected.h +++ b/dbus/dbus-server-protected.h @@ -25,6 +25,7 @@ #include #include +#include #include #include @@ -53,7 +54,8 @@ struct DBusServer int refcount; /**< Reference count. */ const DBusServerVTable *vtable; /**< Virtual methods for this instance. */ DBusWatchList *watches; /**< Our watches */ - + DBusTimeoutList *timeouts; /**< Our timeouts */ + DBusCounter *connection_counter; /**< Number of non-finalized DBusConnection * to this server */ @@ -72,13 +74,18 @@ struct DBusServer unsigned int disconnected : 1; /**< TRUE if we are disconnected. */ }; -dbus_bool_t _dbus_server_init_base (DBusServer *server, - const DBusServerVTable *vtable); -void _dbus_server_finalize_base (DBusServer *server); -dbus_bool_t _dbus_server_add_watch (DBusServer *server, - DBusWatch *watch); -void _dbus_server_remove_watch (DBusServer *server, - DBusWatch *watch); +dbus_bool_t _dbus_server_init_base (DBusServer *server, + const DBusServerVTable *vtable); +void _dbus_server_finalize_base (DBusServer *server); +dbus_bool_t _dbus_server_add_watch (DBusServer *server, + DBusWatch *watch); +void _dbus_server_remove_watch (DBusServer *server, + DBusWatch *watch); +dbus_bool_t _dbus_server_add_timeout (DBusServer *server, + DBusTimeout *timeout); +void _dbus_server_remove_timeout (DBusServer *server, + DBusTimeout *timeout); + DBUS_END_DECLS; -- cgit