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, 32 insertions, 32 deletions

diff --git a/glib/dbus-gmain.c b/glib/dbus-gmain.c
index 5eb75d10..b00320f2 100644
--- a/glib/dbus-gmain.c
+++ b/glib/dbus-gmain.c
@@ -63,47 +63,47 @@ static int connection_slot = -1;
 static GStaticMutex server_slot_lock = G_STATIC_MUTEX_INIT;
 static int server_slot = -1;
 
-static gboolean dbus_connection_prepare  (GSource     *source,
-                                          gint        *timeout);
-static gboolean dbus_connection_check    (GSource     *source);
-static gboolean dbus_connection_dispatch (GSource     *source,
-                                          GSourceFunc  callback,
-                                          gpointer     user_data);
-static gboolean dbus_server_prepare      (GSource     *source,
-                                          gint        *timeout);
-static gboolean dbus_server_check        (GSource     *source);
-static gboolean dbus_server_dispatch     (GSource     *source,
-                                          GSourceFunc  callback,
-                                          gpointer     user_data);
+static gboolean gsource_connection_prepare  (GSource     *source,
+                                             gint        *timeout);
+static gboolean gsource_connection_check    (GSource     *source);
+static gboolean gsource_connection_dispatch (GSource     *source,
+                                             GSourceFunc  callback,
+                                             gpointer     user_data);
+static gboolean gsource_server_prepare      (GSource     *source,
+                                             gint        *timeout);
+static gboolean gsource_server_check        (GSource     *source);
+static gboolean gsource_server_dispatch     (GSource     *source,
+                                             GSourceFunc  callback,
+                                             gpointer     user_data);
 
 static GSourceFuncs dbus_connection_funcs = {
-  dbus_connection_prepare,
-  dbus_connection_check,
-  dbus_connection_dispatch,
+  gsource_connection_prepare,
+  gsource_connection_check,
+  gsource_connection_dispatch,
   NULL
 };
 
 static GSourceFuncs dbus_server_funcs = {
-  dbus_server_prepare,
-  dbus_server_check,
-  dbus_server_dispatch,
+  gsource_server_prepare,
+  gsource_server_check,
+  gsource_server_dispatch,
   NULL
 };
 
 static gboolean
-dbus_connection_prepare (GSource *source,
-			 gint    *timeout)
+gsource_connection_prepare (GSource *source,
+                            gint    *timeout)
 {
   DBusConnection *connection = ((DBusGSource *)source)->connection_or_server;
   
   *timeout = -1;
 
-  return (dbus_connection_get_n_messages (connection) > 0);  
+  return (dbus_connection_get_dispatch_status (connection) == DBUS_DISPATCH_DATA_REMAINS);  
 }
 
 static gboolean
-dbus_server_prepare (GSource *source,
-                     gint    *timeout)
+gsource_server_prepare (GSource *source,
+                        gint    *timeout)
 {
   *timeout = -1;
 
@@ -132,13 +132,13 @@ dbus_gsource_check (GSource *source)
 }
 
 static gboolean
-dbus_connection_check (GSource *source)
+gsource_connection_check (GSource *source)
 {
   return dbus_gsource_check (source);
 }
 
 static gboolean
-dbus_server_check (GSource *source)
+gsource_server_check (GSource *source)
 {
   return dbus_gsource_check (source);
 }
@@ -192,9 +192,9 @@ dbus_gsource_dispatch (GSource     *source,
 }
 
 static gboolean
-dbus_connection_dispatch (GSource     *source,
-			  GSourceFunc  callback,
-			  gpointer     user_data)
+gsource_connection_dispatch (GSource     *source,
+                             GSourceFunc  callback,
+                             gpointer     user_data)
 {
   DBusGSource *dbus_source = (DBusGSource *)source;
   DBusConnection *connection = dbus_source->connection_or_server;
@@ -205,7 +205,7 @@ dbus_connection_dispatch (GSource     *source,
                          FALSE);
   
   /* Dispatch messages */
-  while (dbus_connection_dispatch_message (connection))
+  while (dbus_connection_dispatch (connection) == DBUS_DISPATCH_DATA_REMAINS)
     ;
 
    dbus_connection_unref (connection);
@@ -214,9 +214,9 @@ dbus_connection_dispatch (GSource     *source,
 }
 
 static gboolean
-dbus_server_dispatch (GSource     *source,
-                      GSourceFunc  callback,
-                      gpointer     user_data)
+gsource_server_dispatch (GSource     *source,
+                         GSourceFunc  callback,
+                         gpointer     user_data)
 {
   DBusGSource *dbus_source = (DBusGSource *)source;
   DBusServer *server = dbus_source->connection_or_server;