Fixed crash during deregistering applications.

[platform/upstream/at-spi2-core.git] / registryd / deviceeventcontroller-x11.c

diff --git a/registryd/deviceeventcontroller-x11.c b/registryd/deviceeventcontroller-x11.c
index 45a6727..5c2cf89 100644 (file)
--- a/registryd/deviceeventcontroller-x11.c
+++ b/registryd/deviceeventcontroller-x11.c
@@ -65,9 +65,6 @@
 
 #include "introspection.h"
 
-KeySym ucs2keysym (long ucs);
-long keysym2ucs(KeySym keysym); 
-
 static void spi_dec_x11_emit_modifier_event (SpiDEController *controller,
                             guint prev_mask,
                             guint current_mask);
@@ -240,6 +237,7 @@ spi_dec_x11_get_keycode (SpiDEController *controller,
                         * Long-term fix is to extend the X keymap here instead of replace entries.
                         */
                        priv->reserved_reset_timeout = g_timeout_add (500, spi_dec_reset_reserved, priv);
+                       g_source_set_name_by_id (priv->reserved_reset_timeout, "[at-spi2-core] spi_dec_reset_reserved");
                }               
                if (modmask)
                        *modmask = 0;
@@ -731,7 +729,7 @@ spi_controller_register_with_devices (SpiDEController *controller)
       {
          if (priv->xkb_desc->map->key_sym_map[i].kt_index[0] == XkbOneLevelIndex)
          { 
-             if (XKeycodeToKeysym (spi_get_display (), i, 0) != 0)
+             if (XkbKeycodeToKeysym (spi_get_display (), i, 0, 0) != 0)
              {
                  /* don't use this one if there's a grab client! */
 
@@ -762,7 +760,7 @@ spi_controller_register_with_devices (SpiDEController *controller)
       if (reserved) 
       {
          priv->reserved_keycode = reserved;
-         priv->reserved_keysym = XKeycodeToKeysym (spi_get_display (), reserved, 0);
+         priv->reserved_keysym = XkbKeycodeToKeysym (spi_get_display (), reserved, 0, 0);
       }
       else
       { 
@@ -1149,7 +1147,7 @@ spi_dec_x11_unlock_modifiers (SpiDEController *controller, unsigned modifiers)
 static KeySym
 keysym_for_unichar (SpiDEController *controller, gunichar unichar)
 {
-       return ucs2keysym ((long) unichar);
+       return (KeySym) ucs2keysym ((long) unichar);
 }
 
 static gboolean
@@ -1376,6 +1374,7 @@ wait_for_release_event (XEvent          *event,
 {
   pressed_event = spi_keystroke_from_x_key_event ((XKeyEvent *) event);
   check_release_handler = g_timeout_add (CHECK_RELEASE_DELAY, check_release, &pressed_event);
+  g_source_set_name_by_id (check_release_handler, "[at-spi2-core] check_release");
 }
 
 static void