* dbus/dbus-connection.h: remove connection_disconnect and replace with

  connection_close

* dbus/dbus-connection.c: include dbus-bus.h
  (_dbus_connection_read_write_dispatch): make static

diff --git a/ChangeLog b/ChangeLog
index b8062ca..703b46a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-07-07  John (J5) Palmieri  <johnp@redhat.com>
 
+       * dbus/dbus-connection.h: remove connection_disconnect and replace with
+       connection_close
+
+       * dbus/dbus-connection.c: include dbus-bus.h
+       (_dbus_connection_read_write_dispatch): make static
+
+2006-07-07  John (J5) Palmieri  <johnp@redhat.com>
+
        * dbus/dbus-connection.c (dbus_connection_close): removed deprecated
        function
        (dbus_connection_dispatch): On disconnect unref any shared connections

diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 9f6e626..62a2383 100644 (file)
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -39,6 +39,7 @@
 #include "dbus-pending-call.h"
 #include "dbus-object-tree.h"
 #include "dbus-threads-internal.h"
+#include "dbus-bus.h"
 
 #ifdef DBUS_DISABLE_CHECKS
 #define TOOK_LOCK_CHECK(connection)
@@ -2869,7 +2870,7 @@ dbus_connection_flush (DBusConnection *connection)
  * @param dispatch dispatch new messages or leave them on the incoming queue
  * @returns #TRUE if the disconnect message has not been processed
  */
-dbus_bool_t
+static dbus_bool_t
 _dbus_connection_read_write_dispatch (DBusConnection *connection,
                                      int             timeout_milliseconds, 
                                      dbus_bool_t     dispatch)

diff --git a/dbus/dbus-connection.h b/dbus/dbus-connection.h
index 983f327..0cab8da 100644 (file)
--- a/dbus/dbus-connection.h
+++ b/dbus/dbus-connection.h
@@ -93,7 +93,7 @@ DBusConnection*    dbus_connection_open_private                 (const char
                                                                  DBusError                  *error);
 DBusConnection*    dbus_connection_ref                          (DBusConnection             *connection);
 void               dbus_connection_unref                        (DBusConnection             *connection);
-void               dbus_connection_disconnect                   (DBusConnection             *connection);
+void               dbus_connection_close                        (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_set_exit_on_disconnect       (DBusConnection             *connection,