dbus/dbus dbus-connection.c,1.86,1.87

[Joe Shaw]

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

Modified Files:
	dbus-connection.c 
Log Message:
2005-01-11  Joe Shaw  <joeshaw@novell.com>

	Patch from Timo Teräs <ext-timo.teras@nokia.com>

	* dbus/dbus-connection.c
	(_dbus_connection_queue_received_message_link): Call
	_dbus_connection_remove_timeout() instead of the _locked()
	variant, since it's always called from
	_dbus_connection_handle_watch(), which handles the locking.
	Removed the _locked() variant since it's no longer used.

Index: dbus-connection.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-connection.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- dbus-connection.c	27 Nov 2004 07:30:22 -0000	1.86
+++ dbus-connection.c	11 Jan 2005 19:31:56 -0000	1.87
@@ -224,8 +224,6 @@
 #endif 
 };
 
-static void               _dbus_connection_remove_timeout_locked             (DBusConnection     *connection,
-                                                                              DBusTimeout        *timeout);
 static DBusDispatchStatus _dbus_connection_get_dispatch_status_unlocked      (DBusConnection     *connection);
 static void               _dbus_connection_update_dispatch_status_and_unlock (DBusConnection     *connection,
                                                                               DBusDispatchStatus  new_status);
@@ -349,8 +347,8 @@
       if (pending != NULL)
 	{
 	  if (pending->timeout_added)
-	    _dbus_connection_remove_timeout_locked (connection,
-                                                    pending->timeout);
+	    _dbus_connection_remove_timeout (connection,
+                                             pending->timeout);
 
 	  pending->timeout_added = FALSE;
 	}
@@ -594,15 +592,6 @@
 				       timeout);
 }
 
-static void
-_dbus_connection_remove_timeout_locked (DBusConnection *connection,
-					DBusTimeout    *timeout)
-{
-  CONNECTION_LOCK (connection);
-  _dbus_connection_remove_timeout (connection, timeout);
-  CONNECTION_UNLOCK (connection);
-}
-
 /**
  * Toggles a timeout and notifies app via connection's
  * DBusTimeoutToggledFunction if available. It's an error to call this