e_desk: rename e_desk_client_del to e_desk_client_remove

Change-Id: Id69bfee9caf6437aa4f27077da626046b2a67332

diff --git a/src/bin/core/e_desk.c b/src/bin/core/e_desk.c
index 9e721470046ab712bad27d751142bd4cbc38e407..02275ffd6f061780a59fb5a2e6428d3ec677fe06 100644 (file)
--- a/src/bin/core/e_desk.c
+++ b/src/bin/core/e_desk.c
@@ -33,7 +33,7 @@ struct _E_Desk_Private
    struct
      {
         struct wl_signal client_add;
-        struct wl_signal client_del;
+        struct wl_signal client_remove;
         struct wl_signal desk_area_enable;
         struct wl_signal desk_area_disable;
         struct wl_signal desk_area_active_change;
@@ -93,7 +93,7 @@ _e_desk_private_init(E_Desk *desk)
    priv->desk = desk;
 
    wl_signal_init(&priv->events.client_add);
-   wl_signal_init(&priv->events.client_del);
+   wl_signal_init(&priv->events.client_remove);
    wl_signal_init(&priv->events.desk_area_enable);
    wl_signal_init(&priv->events.desk_area_disable);
    wl_signal_init(&priv->events.desk_area_active_change);
@@ -325,7 +325,7 @@ e_desk_client_add(E_Desk *desk, E_Client *ec)
 }
 
 E_API void
-e_desk_client_del(E_Desk *desk, E_Client *ec)
+e_desk_client_remove(E_Desk *desk, E_Client *ec)
 {
    E_OBJECT_CHECK(desk);
    E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
@@ -335,7 +335,7 @@ e_desk_client_del(E_Desk *desk, E_Client *ec)
 
    if (!e_desk_has_ec(desk, ec)) return;
 
-   wl_signal_emit(&PRI(desk)->events.client_del, ec);
+   wl_signal_emit(&PRI(desk)->events.client_remove, ec);
 }
 
 E_API void
@@ -876,10 +876,10 @@ e_desk_client_add_listener_add(E_Desk *desk, struct wl_listener *listener)
 }
 
 EINTERN void
-e_desk_client_del_listener_add(E_Desk *desk, struct wl_listener *listener)
+e_desk_client_remove_listener_add(E_Desk *desk, struct wl_listener *listener)
 {
    API_ENTRY;
-   wl_signal_add(&priv->events.client_del, listener);
+   wl_signal_add(&priv->events.client_remove, listener);
 }
 
 EINTERN void

diff --git a/src/bin/core/e_desk_intern.h b/src/bin/core/e_desk_intern.h
index 9f663713ec6f3ea85c7e665de2a71d8e47cf4d66..40f5883674f60078c9ab5d3305385acf9ada19f0 100644 (file)
--- a/src/bin/core/e_desk_intern.h
+++ b/src/bin/core/e_desk_intern.h
@@ -91,7 +91,7 @@ EINTERN void         e_desk_desk_area_info_print(E_Desk *desk);
 
 // listeners
 EINTERN void e_desk_client_add_listener_add(E_Desk *desk, struct wl_listener *listener);
-EINTERN void e_desk_client_del_listener_add(E_Desk *desk, struct wl_listener *listener);
+EINTERN void e_desk_client_remove_listener_add(E_Desk *desk, struct wl_listener *listener);
 EINTERN void e_desk_desk_area_enable_listener_add(E_Desk *desk, struct wl_listener *listener);
 EINTERN void e_desk_desk_area_disable_listener_add(E_Desk *desk, struct wl_listener *listener);
 EINTERN void e_desk_desk_area_active_change_listener_add(E_Desk *desk, struct wl_listener *listener);

diff --git a/src/bin/windowmgr/e_policy_desk.c b/src/bin/windowmgr/e_policy_desk.c
index db8df5b4b0850e90dd7f85bb2e4c3d29b2d57755..9c21afda86844ae0e9a49f0dc1fa5235eba4fd70 100644 (file)
--- a/src/bin/windowmgr/e_policy_desk.c
+++ b/src/bin/windowmgr/e_policy_desk.c
@@ -683,7 +683,7 @@ _e_policy_desk_smart_member_add(Evas_Object *obj, Evas_Object *child)
      {
         ec_desk = e_comp_desk_find_by_ec(ec);
         if (ec_desk)
-          e_desk_client_del(ec_desk, ec);
+          e_desk_client_remove(ec_desk, ec);
      }
 }
 
@@ -1043,7 +1043,7 @@ _e_policy_desk_cb_desk_client_add(struct wl_listener *listener, void *data)
 }
 
 static void
-_e_policy_desk_cb_desk_client_del(struct wl_listener *listener, void *data)
+_e_policy_desk_cb_desk_client_remove(struct wl_listener *listener, void *data)
 {
    E_Policy_Desk *pd;
    E_Desk *desk;
@@ -2153,8 +2153,8 @@ e_policy_desk_add(E_Desk *desk)
    e_desk_desk_deskshow_listener_add(pd->desk, &pd->desk_deskshow);
    pd->desk_client_add.notify = _e_policy_desk_cb_desk_client_add;
    e_desk_client_add_listener_add(pd->desk, &pd->desk_client_add);
-   pd->desk_client_del.notify = _e_policy_desk_cb_desk_client_del;
-   e_desk_client_del_listener_add(pd->desk, &pd->desk_client_del);
+   pd->desk_client_del.notify = _e_policy_desk_cb_desk_client_remove;
+   e_desk_client_remove_listener_add(pd->desk, &pd->desk_client_del);
    pd->geometry_set.notify = _e_policy_desk_cb_desk_geometry_set;
    e_desk_geometry_set_listener_add(pd->desk, &pd->geometry_set);
    pd->zoom_set.notify = _e_policy_desk_cb_desk_zoom_set;

diff --git a/src/bin/windowmgr/e_policy_zone.c b/src/bin/windowmgr/e_policy_zone.c
index 890eb6449d97a245b6e8966a294ae7e84ee9181d..53e709c8e2a39ed6b5e29dc39b4183c83c77ba13 100644 (file)
--- a/src/bin/windowmgr/e_policy_zone.c
+++ b/src/bin/windowmgr/e_policy_zone.c
@@ -982,7 +982,7 @@ _policy_zone_cb_client_destroy(struct wl_listener *listener, void *data)
 
    wl_signal_emit_mutable(&policy_zone->events.client_remove, ec);
 
-   e_desk_client_del(desk, ec);
+   e_desk_client_remove(desk, ec);
    wl_list_remove(&zone_client->client_above_get.link);
    wl_list_remove(&zone_client->client_below_get.link);
    wl_list_remove(&zone_client->client_visible_above_get.link);

diff --git a/src/bin/windowmgr/services/e_service_quickpanel.c b/src/bin/windowmgr/services/e_service_quickpanel.c
index c2509acb9233f41a60b91fdf981f7343040cd28b..4907d8d4bbbda4d6a9429d843410e9cf875295c7 100644 (file)
--- a/src/bin/windowmgr/services/e_service_quickpanel.c
+++ b/src/bin/windowmgr/services/e_service_quickpanel.c
@@ -274,7 +274,7 @@ _mover_intercept_show(void *data, Evas_Object *obj)
    if (e_config->qp_add_on_desk_smart)
      {
         desk = e_desk_current_get(qp->zone);
-        e_desk_client_del(desk, ec);
+        e_desk_client_remove(desk, ec);
      }
 
    e_layout_pack(md->qp_layout_obj, ec->frame);

diff --git a/src/include/e_desk.h b/src/include/e_desk.h
index d5c4aae4cc3a29000e79744040707cf5ce85a083..6b2866001c1f09a6c26e638c74852b692d9178d1 100644 (file)
--- a/src/include/e_desk.h
+++ b/src/include/e_desk.h
@@ -96,7 +96,7 @@ E_API Eina_Bool    e_desk_client_zoom_skip_unset(E_Desk *desk, E_Client *ec);
 
 E_API void         e_desk_smart_member_add(E_Desk *desk, Evas_Object *obj);
 E_API void         e_desk_smart_member_del(Evas_Object *obj);
-E_API void         e_desk_client_del(E_Desk *desk, E_Client *ec);
+E_API void         e_desk_client_remove(E_Desk *desk, E_Client *ec);
 
 E_API Eina_Bool    e_desk_desk_area_enable_get(E_Desk *desk);
 E_API E_Desk_Area *e_desk_desk_area_add(E_Desk *desk, int x, int y, int w, int h, E_Desk_Area_Layer layer);