dbus/dbus dbus-connection.c, 1.119, 1.120 dbus-connection.h, 1.41, 1.42

[John Palmieri]

Update of /cvs/dbus/dbus/dbus
In directory kemper:/tmp/cvs-serv26814/dbus

Modified Files:
	dbus-connection.c dbus-connection.h 
Log Message:
* 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



Index: dbus-connection.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-connection.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- dbus-connection.c	7 Jul 2006 19:42:56 -0000	1.119
+++ dbus-connection.c	7 Jul 2006 21:56:30 -0000	1.120
@@ -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 @@
  * @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)

Index: dbus-connection.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-connection.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- dbus-connection.h	7 Jul 2006 19:42:56 -0000	1.41
+++ dbus-connection.h	7 Jul 2006 21:56:30 -0000	1.42
@@ -93,7 +93,7 @@
                                                                  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,