2005-05-26 Michael Meeks <michael.meeks@novell.com>

	* cspi/bonobo/cspi-bonobo-listener.c
	(cspi_event_list_remove_by_cb): actually filter by callback.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@755 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index a05945384ea8f07118fe44dd3a31efe119751923..50b7a49130da93cc4feb3d0effaed6f48f73b501 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-26  Michael Meeks  <michael.meeks@novell.com>
+
+       * cspi/bonobo/cspi-bonobo-listener.c
+       (cspi_event_list_remove_by_cb): actually filter by callback.
+
 2005-05-25  Bill Haneman <bill.haneman@sun.com>
 
        * registryd/registry.c (remove_listener_cb):

diff --git a/cspi/bonobo/cspi-bonobo-listener.c b/cspi/bonobo/cspi-bonobo-listener.c
index c3c088f449645687ec5bc9945eef4e9466f59c62..2992b4abc15ca593335350b766968327c4067e1c 100644 (file)
--- a/cspi/bonobo/cspi-bonobo-listener.c
+++ b/cspi/bonobo/cspi-bonobo-listener.c
@@ -71,10 +71,12 @@ cspi_event_list_remove_by_cb (GList *list, gpointer callback)
     {
       EventHandler *eh = l->data;
       next = l->next;
-      
-      list = g_list_delete_link (list, l);
-      
-      cspi_event_handler_free (eh);
+
+      if (eh->method == callback)
+      {
+        list = g_list_delete_link (list, l);
+       cspi_event_handler_free (eh);
+      }
     }
 
   return list;