Tweak to michael's patch, makes listener deregistration rules match

event emission filter rules.

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

diff --git a/ChangeLog b/ChangeLog
index 9dce19e..a059453 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-25  Bill Haneman <bill.haneman@sun.com>
+
+       * registryd/registry.c (remove_listener_cb):
+       Make deregistration filter rules match the event emission rules.
+
 2005-05-25  Michael Meeks  <michael.meeks@novell.com>
 
        * registryd/registry.c (remove_listener_cb),

diff --git a/registryd/registry.c b/registryd/registry.c
index 39855bb..0c8218f 100644 (file)
--- a/registryd/registry.c
+++ b/registryd/registry.c
@@ -438,7 +438,8 @@ remove_listener_cb (GList * const *list, gpointer user_data)
 
   CORBA_exception_init (&ev);
 
-  if (cl->remove_all || (cl->etype.minor == ls->event_type_quark &&
+  if (cl->remove_all || (((cl->etype.minor == ls->event_type_quark) || 
+                        (cl->etype.major == ls->event_type_quark)) &&
                         cl->etype.type_cat == ls->event_type_cat ) )
   {
     if (CORBA_Object_is_equivalent (ls->listener, cl->listener, &ev))