Add client destroy listener when add a grabbed client to grab list

Change-Id: I0b3811c872c43b4fef70022006f9bb07157224ba

diff --git a/src/e_mod_keyrouter_list.c b/src/e_mod_keyrouter_list.c
index 0140902..693aa12 100644 (file)
--- a/src/e_mod_keyrouter_list.c
+++ b/src/e_mod_keyrouter_list.c
@@ -199,13 +199,7 @@ e_keyrouter_prepend_to_keylist(struct wl_resource *surface, struct wl_client *wc
              e_keyrouter_add_surface_destroy_listener(surface);
              /* TODO: if failed add surface_destory_listener, remove keygrabs */
           }
-        /* Add a client destroy listener if cynara is not enabled.
-           If cynara is enabled, client destroy listener is added at privilege checking time */
-#ifdef ENABLE_CYNARA
-        else if (!krt->p_cynara && wc)
-#else
         else if (wc)
-#endif
           {
              e_keyrouter_add_client_destroy_listener(wc);
              /* TODO: if failed add client_destory_listener, remove keygrabs */

diff --git a/src/e_mod_main_wl.c b/src/e_mod_main_wl.c
index 5798513..28e67a8 100644 (file)
--- a/src/e_mod_main_wl.c
+++ b/src/e_mod_main_wl.c
@@ -1513,7 +1513,6 @@ _e_keyrouter_util_do_privilege_check(struct wl_client *client, int socket_fd, ui
    if (CYNARA_API_ACCESS_ALLOWED == ret)
      {
         res = EINA_TRUE;
-        e_keyrouter_add_client_destroy_listener(client);
      }
    else
      {