Fixed what seems to have been a botched checking from Dec 21, some fixes

[platform/core/uifw/at-spi2-atk.git] / cspi / spi_registry.c

diff --git a/cspi/spi_registry.c b/cspi/spi_registry.c
index aae9358..0d75803 100644 (file)
--- a/cspi/spi_registry.c
+++ b/cspi/spi_registry.c
@@ -275,7 +275,7 @@ SPI_registerAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener,
         {
           /* we overload the keyset long w/keycodes, the - bit acts as a flag */
           key_set._buffer[i] = (keys->keysyms[i]) ? keys->keysyms[i] :
-                                                -keys->keycodes[i];
+                                                 - keys->keycodes[i];
          /* fprintf (stderr, "key-set %d = %d\n", i, (int) key_set->_buffer[i]); */
         }
     }
@@ -310,18 +310,19 @@ SPI_registerAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener,
     }
   key_events._length = i;
   
-  controller_event_mask.value = (CORBA_unsigned_long) modmask;
-  controller_event_mask.refcount = (CORBA_unsigned_short) 1;
+  controller_event_mask = (CORBA_unsigned_long) modmask;
 
   Accessibility_DeviceEventController_registerKeystrokeListener (
     device_event_controller,
     cspi_event_listener_get_corba (listener),
     &key_set,
-    &controller_event_mask,
+    controller_event_mask,
     &key_events,
-    (CORBA_boolean) ((sync_type & SPI_KEYLISTENER_ALL_WINDOWS)!=0),
+    ((sync_type & SPI_KEYLISTENER_ALL_WINDOWS)!=0) ? CORBA_TRUE : CORBA_FALSE,
     cspi_ev ());
 
+  cspi_return_val_if_ev ("registering keystroke listener", FALSE);
+
   cspi_release_unref (device_event_controller);
 
   return TRUE;
@@ -358,8 +359,7 @@ SPI_deregisterAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener
 
   cspi_return_val_if_ev ("getting keystroke listener", FALSE);
 
-  controller_event_mask.value = (CORBA_unsigned_long) modmask;
-  controller_event_mask.refcount = (CORBA_unsigned_short) 1;
+  controller_event_mask = (CORBA_unsigned_long) modmask;
 
   key_events._buffer = NULL;
   key_events._length = 0;
@@ -371,7 +371,7 @@ SPI_deregisterAccessibleKeystrokeListener (AccessibleKeystrokeListener *listener
     device_event_controller,
     cspi_event_listener_get_corba (listener),
     &key_set,
-    &controller_event_mask,
+    controller_event_mask,
     &key_events,
     (CORBA_boolean) TRUE,
     cspi_ev ());
@@ -404,6 +404,7 @@ SPI_generateKeyEvent (long int keyval, AccessibleKeySynthType synth_type)
   Accessibility_DeviceEventController device_event_controller = 
          Accessibility_Registry_getDeviceEventController (cspi_registry (), cspi_ev ());
 
+  g_print ("keyval %d\n", (int) keyval);
   cspi_return_val_if_ev ("getting event controller", FALSE);
 
   Accessibility_DeviceEventController_generateKeyEvent (device_event_controller,