From fe4018941190f8bf020e4a8ed2999c212e0e113d Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Sat, 15 Feb 2003 16:25:08 +0000
Subject: 2003-02-15  Alexander Larsson  <alexl@redhat.com>

	* dbus/dbus-threads.c:
	* dbus/dbus-threads.h:
	Add condvars. Remove static mutext from API.
	Implement static mutexes by initializing them from threads_init.

	* glib/dbus-gthread.c:
	* qt/dbus-qthread.cpp:
	Update with the thread api changes.


	* dbus/dbus-list.c:
	* dbus/dbus-list.h:
	Turn StaticMutex into normal mutex + init function.
	Export new functions _dbus_list_alloc_link, _dbus_list_free_link,
	_dbus_list_append_link, _dbus_list_prepend_link


	* dbus/dbus-sysdeps.c:
	* dbus/dbus-sysdeps.h:
	New type dbus_atomic_t, and new functions _dbus_atomic_inc,
	_dbus_atomic_dec. Only slow fallback implementation at the moment.

	* dbus/dbus-protocol.h:
	Add DBUS_MESSAGE_LOCAL_DISCONNECT define

	* dbus/dbus-message.c:
	Make ref/unref atomic.
	Fix some docs.

	* dbus/dbus-connection-internal.h:
	* dbus/dbus-connection.c:
	* dbus/dbus-connection.h:
	Make threadsafe.
	Change _peek to _borrow,_return & _steal_borrowed.
	Change disconnect callback to event.
	Make dbus_connection_dispatch_messages reentrant.

	* dbus/dbus-transport.c:
	Don't ref the connection on calls to the transport
	implementation.

	* dbus/dbus-message-handler.c:
	Make threadsafe.

	* glib/dbus-gmain.c:
	Don't use peek_message anymore

	* test/Makefile.am:
	* test/debug-thread.c:
	* test/debug-thread.h:
	Simple thread implementation that asserts() on deadlocks in
	single-threaded code.

	* test/bus-test.c:
	(main) Call debug_threads_init.

	* test/watch.c:
	Use disconnect message instead of disconnect callback.

	* bus/connection.c:
	* bus/connection.h:
	Don't call dbus_connection_set_disconnect_function. Instead export
	bus_connection_disconnect.

	* bus/dispatch.c:
	Call bus_connection_disconnect when we get a disconnected message.
---
 dbus/dbus-connection.h | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to 'dbus/dbus-connection.h')

diff --git a/dbus/dbus-connection.h b/dbus/dbus-connection.h
index 036d6776..774374e0 100644
--- a/dbus/dbus-connection.h
+++ b/dbus/dbus-connection.h
@@ -66,21 +66,23 @@ typedef void (* DBusAddTimeoutFunction)    (DBusTimeout    *timeout,
 typedef void (* DBusRemoveTimeoutFunction) (DBusTimeout    *timeout,
 					    void           *data);
 
-typedef void (* DBusDisconnectFunction)    (DBusConnection *connection,
-					    void           *data);
+DBusConnection* dbus_connection_open                   (const char     *address,
+							DBusResultCode *result);
+void            dbus_connection_ref                    (DBusConnection *connection);
+void            dbus_connection_unref                  (DBusConnection *connection);
+void            dbus_connection_disconnect             (DBusConnection *connection);
+dbus_bool_t     dbus_connection_get_is_connected       (DBusConnection *connection);
+dbus_bool_t     dbus_connection_get_is_authenticated   (DBusConnection *connection);
+void            dbus_connection_flush                  (DBusConnection *connection);
+int             dbus_connection_get_n_messages         (DBusConnection *connection);
+DBusMessage*    dbus_connection_borrow_message         (DBusConnection *connection);
+void            dbus_connection_return_message         (DBusConnection *connection,
+							DBusMessage    *message);
+void            dbus_connection_steal_borrowed_message (DBusConnection *connection,
+							DBusMessage    *message);
+DBusMessage*    dbus_connection_pop_message            (DBusConnection *connection);
+dbus_bool_t     dbus_connection_dispatch_message       (DBusConnection *connection);
 
-DBusConnection* dbus_connection_open                 (const char     *address,
-                                                      DBusResultCode *result);
-void            dbus_connection_ref                  (DBusConnection *connection);
-void            dbus_connection_unref                (DBusConnection *connection);
-void            dbus_connection_disconnect           (DBusConnection *connection);
-dbus_bool_t     dbus_connection_get_is_connected     (DBusConnection *connection);
-dbus_bool_t     dbus_connection_get_is_authenticated (DBusConnection *connection);
-void            dbus_connection_flush                (DBusConnection *connection);
-int             dbus_connection_get_n_messages       (DBusConnection *connection);
-DBusMessage*    dbus_connection_peek_message         (DBusConnection *connection);
-DBusMessage*    dbus_connection_pop_message          (DBusConnection *connection);
-dbus_bool_t     dbus_connection_dispatch_message     (DBusConnection *connection);
 
 dbus_bool_t  dbus_connection_send_message                      (DBusConnection     *connection,
 								DBusMessage        *message,
@@ -97,10 +99,6 @@ DBusMessage *dbus_connection_send_message_with_reply_and_block (DBusConnection
 								DBusResultCode     *result);
 
 
-void dbus_connection_set_disconnect_function (DBusConnection            *connection,
-					      DBusDisconnectFunction     function,
-					      void                      *data,
-					      DBusFreeFunction           free_data_function);
 void dbus_connection_set_watch_functions     (DBusConnection            *connection,
 					      DBusAddWatchFunction       add_function,
 					      DBusRemoveWatchFunction    remove_function,
-- 
cgit