Fix for bugzilla #319984.

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

diff --git a/ChangeLog b/ChangeLog
index 9e5c46e..11fbb0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-27 Bill Haneman <bill.haneman@sun.com>
+
+       * registryd/deviceeventcontroller.c:
+       (spi_controller_notify_keylisteners): Check
+       to make sure the event listener has requested 'preemptive'
+       status before pre-empting an event.
+       
 2005-08-29 Bill Haneman <bill.haneman@sun.com>
 
        * configure.in, README, NEWS: Release 1.6.5.

diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index 56d8686..b908a36 100644 (file)
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -1451,7 +1451,8 @@ spi_controller_notify_keylisteners (SpiDEController                 *controller,
       DEControllerKeyListener *key_listener = l2->data;            
       Accessibility_DeviceEventListener ls = key_listener->listener.object;
 
-      is_consumed = Accessibility_DeviceEventListener_notifyEvent (ls, key_event, ev);
+      is_consumed = Accessibility_DeviceEventListener_notifyEvent (ls, key_event, ev) &&
+                   key_listener->mode->preemptive;
 
       if (BONOBO_EX (ev))
         {