Revert "e_keyrouter_wl: use the new keycancel apis"

This reverts commit 7300e2611adb6d20f511ae07efdbc14f04aba9b1.

Change-Id: I9c616acae45e6cacbb1baf01b2bb3fc389fe70ce

diff --git a/src/bin/server/e_keyrouter_wl.c b/src/bin/server/e_keyrouter_wl.c
index 474fa0d..ede9a50 100644 (file)
--- a/src/bin/server/e_keyrouter_wl.c
+++ b/src/bin/server/e_keyrouter_wl.c
@@ -442,11 +442,8 @@ _e_keyrouter_input_thread_keygrab_unset(void *data)
    return;
 
 cancel:
-   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);
-
+   e_keyrouter_keycancel_send(keygrab_data->client, keygrab_data->surface,
+             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,
@@ -591,11 +588,7 @@ _e_keyrouter_cb_keygrab_unset_list(struct wl_client *client, struct wl_resource
           e_keyrouter_surface_keygrab_unset(surface, ungrab_request->key);
 
 cancel:
-        if (surface)
-          e_keyrouter_surface_keycancel_send(surface, ungrab_request->key);
-        else
-          e_keyrouter_client_keycancel_send(client, ungrab_request->key);
-
+        e_keyrouter_keycancel_send(client, surface, ungrab_request->key);
 done:
         ungrab_request->err = res;