2007-09-08 Li Yuan <li.yuan@sun.com>

        * registryd/deviceeventcontroller.c:
        (spi_key_event_matches_listener):
        Bug #474796. Should not checkmask bit 14 when sond out
        device event.

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

diff --git a/ChangeLog b/ChangeLog
index 2ed2ac0..0cc3095 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-08  Li Yuan  <li.yuan@sun.com>
+
+       * registryd/deviceeventcontroller.c:
+       (spi_key_event_matches_listener):
+       Bug #474796. Should not checkmask bit 14 when sond out 
+       device event.
+
 2007-08-20  Li Yuan  <li.yuan@sun.com>
 
        * libspi/base.c: (spi_base_construct):

diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index 9f6572d..e9ee33a 100644 (file)
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -1420,7 +1420,7 @@ spi_key_event_matches_listener (const Accessibility_DeviceEvent *key_event,
                                DEControllerKeyListener         *listener,
                                CORBA_boolean                    is_system_global)
 {
-  if ((key_event->modifiers == (CORBA_unsigned_short) (listener->mask & 0xFF)) &&
+  if (((key_event->modifiers & 0xFF) == (CORBA_unsigned_short) (listener->mask & 0xFF)) &&
        spi_key_set_contains_key (listener->keys, key_event) &&
        spi_eventtype_seq_contains_event (listener->listener.typeseq, key_event) && 
       (is_system_global == listener->mode->global))