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

1 files changed, 4 insertions, 4 deletions

diff --git a/bus/connection.c b/bus/connection.c
index 3308df0f..2169d8ab 100644
--- a/bus/connection.c
+++ b/bus/connection.c
@@ -141,8 +141,8 @@ connection_watch_callback (DBusWatch     *watch,
   
   dbus_connection_handle_watch (connection, watch, condition);
 
-  while (dbus_connection_dispatch_message (connection))
-    ;
+  bus_connection_dispatch_all_messages (connection);
+  
   dbus_connection_unref (connection);
 }
 
@@ -171,8 +171,8 @@ connection_timeout_callback (DBusTimeout   *timeout,
   
   dbus_timeout_handle (timeout);
 
-  while (dbus_connection_dispatch_message (connection))
-    ;
+  bus_connection_dispatch_all_messages (connection);
+  
   dbus_connection_unref (connection);
 }