dbus/dbus dbus-connection.c,1.111,1.112

[John Palmieri]

Update of /cvs/dbus/dbus/dbus
In directory gabe:/tmp/cvs-serv26394/dbus

Modified Files:
	dbus-connection.c 
Log Message:
* bus/driver.c (bus_driver_handle_introspect): Add signals
  to the introspect data. (patch from Daniel P. Berrange 
  <dan at berrange.com>)

* bus/dispatch.c (check_existent_ping): Add testcase for Ping

* dbus/dbus-connection.c (_dbus_connection_peer_filter,
  _dbus_connection_run_builtin_filters): Changed these to
  be unlock_no_update functions and call 
  _dbus_connection_send_unlocked_no_update instead of
  dbus_connection_send to avoid locking errors.

* doc/TODO: Removed the make Ping test TODO



Index: dbus-connection.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-connection.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- dbus-connection.c	11 Sep 2005 10:02:47 -0000	1.111
+++ dbus-connection.c	3 Oct 2005 19:55:56 -0000	1.112
@@ -3363,8 +3363,8 @@
 * Filter funtion for handling the Peer standard interface
 **/
 static DBusHandlerResult
-_dbus_connection_peer_filter (DBusConnection *connection,
-                              DBusMessage    *message)
+_dbus_connection_peer_filter_unlocked_no_update (DBusConnection *connection,
+                                                 DBusMessage    *message)
 {
   if (dbus_message_is_method_call (message,
                                    DBUS_INTERFACE_PEER,
@@ -3376,8 +3376,9 @@
       ret = dbus_message_new_method_return (message);
       if (ret == NULL)
         return DBUS_HANDLER_RESULT_NEED_MEMORY;
-      
-      sent = dbus_connection_send (connection, ret, NULL);
+     
+      sent = _dbus_connection_send_unlocked_no_update (connection, ret, NULL);
+
       dbus_message_unref (ret);
 
       if (!sent)
@@ -3397,13 +3398,13 @@
 * they should be processed from this method
 **/
 static DBusHandlerResult
-_dbus_connection_run_builtin_filters (DBusConnection *connection,
-                                      DBusMessage    *message)
+_dbus_connection_run_builtin_filters_unlocked_no_update (DBusConnection *connection,
+                                                           DBusMessage    *message)
 {
   /* We just run one filter for now but have the option to run more
      if the spec calls for it in the future */
 
-  return _dbus_connection_peer_filter (connection, message);
+  return _dbus_connection_peer_filter_unlocked_no_update (connection, message);
 }
 
 /**
@@ -3514,8 +3515,8 @@
       result = DBUS_HANDLER_RESULT_HANDLED;
       goto out;
     }
- 
-  result = _dbus_connection_run_builtin_filters (connection, message);
+
+  result = _dbus_connection_run_builtin_filters_unlocked_no_update (connection, message);
   if (result != DBUS_HANDLER_RESULT_NOT_YET_HANDLED)
     goto out;