e_client: rename e_client_unmap to e_client_shell_remove

Change-Id: Idb9e9ce5e39052e0299c65e416571027193a60b0

diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c
index 0e46a615b945a6325c29c4900482fe7cea012371..77ddd384fd0e06746df9f688690d758c24d1137f 100644 (file)
--- a/src/bin/core/e_client.c
+++ b/src/bin/core/e_client.c
@@ -118,7 +118,8 @@ struct _E_Client_Private
         struct wl_signal parent_set;
         struct wl_signal map_prepare;
         struct wl_signal map_post;
-        struct wl_signal unmap;
+
+        struct wl_signal shell_remove;
      } events;
 
    Eina_Bool hide_by_request;
@@ -701,7 +702,8 @@ _e_client_private_init(E_Client *ec)
    wl_signal_init(&priv->events.parent_set);
    wl_signal_init(&priv->events.map_prepare);
    wl_signal_init(&priv->events.map_post);
-   wl_signal_init(&priv->events.unmap);
+
+   wl_signal_init(&priv->events.shell_remove);
 
    e_object_data_set(E_OBJECT(ec), priv);
 
@@ -2659,11 +2661,11 @@ e_client_map_post(E_Client *ec)
 }
 
 EINTERN void
-e_client_unmap(E_Client *ec)
+e_client_shell_remove(E_Client *ec)
 {
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
-   wl_signal_emit(&PRI(ec)->events.unmap, NULL);
+   wl_signal_emit(&PRI(ec)->events.shell_remove, NULL);
 }
 
 EINTERN void
@@ -6431,10 +6433,10 @@ e_client_map_post_listener_add(E_Client *ec, struct wl_listener *listener)
 }
 
 EINTERN void
-e_client_unmap_listener_add(E_Client *ec, struct wl_listener *listener)
+e_client_shell_remove_listener_add(E_Client *ec, struct wl_listener *listener)
 {
    API_ENTRY;
-   wl_signal_add(&priv->events.unmap, listener);
+   wl_signal_add(&priv->events.shell_remove, listener);
 }
 
 static E_Desktop_Surface *

diff --git a/src/bin/core/e_client_intern.h b/src/bin/core/e_client_intern.h
index 13d3d69c52816ae9a07fbb073fd23588761cfd31..c602c32ac9540c9f4f3ada6b03a3542449a1cbd9 100644 (file)
--- a/src/bin/core/e_client_intern.h
+++ b/src/bin/core/e_client_intern.h
@@ -132,7 +132,8 @@ EINTERN Eina_Bool e_client_mapped_get(E_Client *ec);
 EINTERN void      e_client_mapped_set(E_Client *ec, Eina_Bool set);
 EINTERN void      e_client_map_prepare(E_Client *ec);
 EINTERN void      e_client_map_post(E_Client *ec);
-EINTERN void      e_client_unmap(E_Client *ec);
+
+EINTERN void      e_client_shell_remove(E_Client *ec);
 
 EINTERN void      e_client_modal_child_set(E_Client *ec, E_Client *modal_child);
 EINTERN E_Client *e_client_modal_child_get(E_Client *ec);
@@ -240,7 +241,8 @@ EINTERN void e_client_virtual_touch_listener_add(E_Client *ec, struct wl_listene
 EINTERN void e_client_parent_set_listener_add(E_Client *ec, struct wl_listener *listener);
 EINTERN void e_client_map_prepare_listener_add(E_Client *ec, struct wl_listener *listener);
 EINTERN void e_client_map_post_listener_add(E_Client *ec, struct wl_listener *listener);
-EINTERN void e_client_unmap_listener_add(E_Client *ec, struct wl_listener *listener);
+
+EINTERN void e_client_shell_remove_listener_add(E_Client *ec, struct wl_listener *listener);
 
 EINTERN struct wl_listener  *e_client_destroy_listener_get(E_Client *ec, wl_notify_func_t notify);
 

diff --git a/src/bin/server/e_comp_wl_shell.c b/src/bin/server/e_comp_wl_shell.c
index cb4a57acd4fb6d396575942cd4534eaaef9630dd..eda4226ddd733f63e095d953ca15869edda84640 100644 (file)
--- a/src/bin/server/e_comp_wl_shell.c
+++ b/src/bin/server/e_comp_wl_shell.c
@@ -375,7 +375,7 @@ e_shell_e_client_destroy(E_Client *ec)
              ELOGF("SHELL", "Call shell.unmap by destroy surface", ec);
              e_client_shell_unmap(ec);
           }
-        e_client_unmap(ec);
+        e_client_shell_remove(ec);
      }
 
    if (ec->comp_data)

diff --git a/src/bin/windowmgr/e_policy.c b/src/bin/windowmgr/e_policy.c
index 11c65fe35eb0b1de8817c8c1954a6e90d863172c..b8d000acc84340c0b142bc77b1d08b2b3f88336b 100644 (file)
--- a/src/bin/windowmgr/e_policy.c
+++ b/src/bin/windowmgr/e_policy.c
@@ -156,7 +156,7 @@ _e_policy_desk_client_add_hook_delete(E_Policy_Client *pc)
 static void
 _e_policy_client_del(E_Policy_Client *pc)
 {
-   wl_list_remove(&pc->client_unmap_listener.link);
+   wl_list_remove(&pc->client_shell_remove_listener.link);
    wl_list_remove(&pc->client_map_post_listener.link);
    wl_list_remove(&pc->client_map_prepare_listener.link);
    wl_list_remove(&pc->client_parent_set_listener.link);
@@ -2118,9 +2118,9 @@ _e_policy_client_cb_client_map_post(struct wl_listener *listener, void *data)
 }
 
 static void
-_e_policy_client_cb_client_unmap(struct wl_listener *listener, void *data)
+_e_policy_client_cb_client_shell_remove(struct wl_listener *listener, void *data)
 {
-   E_Policy_Client *policy_client = wl_container_of(listener, policy_client, client_unmap_listener);
+   E_Policy_Client *policy_client = wl_container_of(listener, policy_client, client_shell_remove_listener);
 
    _e_policy_client_unmap(policy_client->ec);
 }
@@ -2185,8 +2185,8 @@ e_policy_client_add(E_Client *ec)
    pc->client_map_post_listener.notify = _e_policy_client_cb_client_map_post;
    e_client_map_post_listener_add(ec, &pc->client_map_post_listener);
 
-   pc->client_unmap_listener.notify = _e_policy_client_cb_client_unmap;
-   e_client_unmap_listener_add(ec, &pc->client_unmap_listener);
+   pc->client_shell_remove_listener.notify = _e_policy_client_cb_client_shell_remove;
+   e_client_shell_remove_listener_add(ec, &pc->client_shell_remove_listener);
 
    return pc;
 }

diff --git a/src/bin/windowmgr/e_policy_intern.h b/src/bin/windowmgr/e_policy_intern.h
index ac6a547bb0d3cae1575303a403f9213141f26762..43081ee3f76245764514ad6a512d8be9884fe9ef 100644 (file)
--- a/src/bin/windowmgr/e_policy_intern.h
+++ b/src/bin/windowmgr/e_policy_intern.h
@@ -76,7 +76,7 @@ struct _E_Policy_Client
    struct wl_listener client_parent_set_listener;
    struct wl_listener client_map_prepare_listener;
    struct wl_listener client_map_post_listener;
-   struct wl_listener client_unmap_listener;
+   struct wl_listener client_shell_remove_listener;
 };
 
 struct _E_Policy_System_Info