dbus/dbus dbus-connection.c,1.128,1.129

[John Palmieri]

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

Modified Files:
	dbus-connection.c 
Log Message:
* dbus/dbus-connection.c (dbus_connection_dispatch): Properly remove
 filters (Patch from Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>)




Index: dbus-connection.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-connection.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- dbus-connection.c	6 Sep 2006 22:00:07 -0000	1.128
+++ dbus-connection.c	8 Sep 2006 15:23:50 -0000	1.129
@@ -3718,6 +3718,13 @@
       DBusMessageFilter *filter = link->data;
       DBusList *next = _dbus_list_get_next_link (&filter_list_copy, link);
 
+      if (filter->function == NULL)
+        {
+          _dbus_verbose ("  filter was removed in a callback function\n");
+          link = next;
+          continue;
+        }
+
       _dbus_verbose ("  running filter on message %p\n", message);
       result = (* filter->function) (connection, message, filter->user_data);