e_keyrouter_wl: use the new keycancel apis

Change-Id: I6c596cd2538f9fab02123cca6626fda7abbf5a95

diff --git a/src/bin/server/e_keyrouter_wl.c b/src/bin/server/e_keyrouter_wl.c
index ede9a50..474fa0d 100644 (file)
--- a/src/bin/server/e_keyrouter_wl.c
+++ b/src/bin/server/e_keyrouter_wl.c
@@ -442,8 +442,11 @@ _e_keyrouter_input_thread_keygrab_unset(void *data)
    return;
 
 cancel:
-   e_keyrouter_keycancel_send(keygrab_data->client, keygrab_data->surface,
-             keygrab_data->key);
+   if (keygrab_data->surface)
+     e_keyrouter_surface_keycancel_send(keygrab_data->surface, keygrab_data->key);
+   else
+     e_keyrouter_client_keycancel_send(keygrab_data->client, keygrab_data->key);
+
 failed:
    KLINF("Failed to %d key ungrab request (wl_client: %p, wl_surface: %p, pid: %d): res: %d",
          keygrab_data->key, keygrab_data->client, keygrab_data->surface,
@@ -588,7 +591,11 @@ _e_keyrouter_cb_keygrab_unset_list(struct wl_client *client, struct wl_resource
           e_keyrouter_surface_keygrab_unset(surface, ungrab_request->key);
 
 cancel:
-        e_keyrouter_keycancel_send(client, surface, ungrab_request->key);
+        if (surface)
+          e_keyrouter_surface_keycancel_send(surface, ungrab_request->key);
+        else
+          e_keyrouter_client_keycancel_send(client, ungrab_request->key);
+
 done:
         ungrab_request->err = res;