e_zone: use e_desk_client_add instead of e_client_desk_set

e_client_desk_set is deprecated and use e_desk_client_add.

Change-Id: I18a8c0075c67eb193076f28f908a6b842df31f90

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 60cfac6..e3fda27 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -299,15 +299,6 @@ _e_client_event_property(E_Client *ec, int prop)
 }
 
 static void
-_e_client_event_desk_set_free(void *d EINA_UNUSED, E_Event_Client_Desk_Set *ev)
-{
-   UNREFD(ev->ec, 4);
-   e_object_unref(E_OBJECT(ev->ec));
-   e_object_unref(E_OBJECT(ev->desk));
-   free(ev);
-}
-
-static void
 _e_client_event_zone_set_free(void *d EINA_UNUSED, E_Event_Client_Zone_Set *ev)
 {
    UNREFD(ev->ec, 5);
@@ -3876,96 +3867,6 @@ E_API Eina_Bool e_client_is_internal(E_Client *ec)
 }
 
 EINTERN void
-e_client_desk_set(E_Client *ec, E_Desk *desk)
-{
-   E_Event_Client_Desk_Set *ev;
-   E_Desk *old_desk;
-   E_Zone *zone;
-
-   E_OBJECT_CHECK(ec);
-   E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
-   E_OBJECT_CHECK(desk);
-   E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
-   if (ec->desk == desk) return;
-
-   if (ec->fullscreen)
-     {
-        ec->desk->fullscreen_clients = eina_list_remove(ec->desk->fullscreen_clients, ec);
-        desk->fullscreen_clients = eina_list_append(desk->fullscreen_clients, ec);
-     }
-   old_desk = ec->desk;
-   if (old_desk)
-     e_desk_client_del(old_desk, ec);
-   ec->desk = desk;
-   e_desk_client_add(desk, ec);
-   if (!ec->new_client)
-     {
-        if (ec->frame)
-          {
-             e_comp_object_effect_unclip(ec->frame);
-             e_comp_object_effect_set(ec->frame, NULL);
-          }
-        if (desk->visible || ec->sticky)
-          {
-             if ((!ec->hidden) && (!ec->iconic))
-               evas_object_show(ec->frame);
-          }
-        else
-          {
-             ec->hidden = 1;
-             evas_object_hide(ec->frame);
-          }
-     }
-   e_client_comp_hidden_set(ec, (!desk->visible) && (!ec->sticky));
-   e_client_zone_set(ec, desk->zone);
-
-   if (old_desk)
-     {
-        ev = E_NEW(E_Event_Client_Desk_Set, 1);
-        if (ev)
-          {
-             ev->ec = ec;
-             UNREFD(ec, 4);
-             e_object_ref(E_OBJECT(ec));
-             ev->desk = old_desk;
-             e_object_ref(E_OBJECT(old_desk));
-             ecore_event_add(E_EVENT_CLIENT_DESK_SET, ev, (Ecore_End_Cb)_e_client_event_desk_set_free, NULL);
-          }
-
-        zone = e_comp_zone_find_by_ec(ec);
-        if (old_desk->zone == zone)
-          {
-             e_client_res_change_geometry_save(ec);
-             e_client_res_change_geometry_restore(ec);
-             ec->pre_res_change.valid = 0;
-          }
-     }
-
-   if (e_config->transient.desktop)
-     {
-        E_Client *child;
-        const Eina_List *l;
-
-        EINA_LIST_FOREACH(ec->transients, l, child)
-          e_client_desk_set(child, ec->desk);
-     }
-
-   evas_object_smart_callback_call(ec->frame, "desk_change", ec);
-
-   if (ec->desk->desk_area.enable)
-     {
-        if (!ec->desk_area.desk_area)
-          {
-             E_Desk_Area *eda;
-             eda = e_desk_desk_area_base_get(ec->desk);
-             e_client_desk_area_set(ec, eda);
-          }
-
-        e_client_desk_area_enable_set(ec, EINA_TRUE);
-     }
-}
-
-EINTERN void
 e_client_desk_iconify_skip_set(E_Client *ec, Eina_Bool skip)
 {
    if (!ec) return;

diff --git a/src/bin/e_client.h b/src/bin/e_client.h
index 472e452..0730d7c 100644 (file)
--- a/src/bin/e_client.h
+++ b/src/bin/e_client.h
@@ -1093,7 +1093,6 @@ E_API E_Client *e_client_from_surface_resource(struct wl_resource *surface_resou
 E_API E_Client *e_client_new(E_Pixmap *cp, int first_map, int internal);
 E_API Eina_Bool e_client_is_internal(E_Client *ec);
 E_API void e_client_unignore(E_Client *ec);
-EINTERN void e_client_desk_set(E_Client *ec, E_Desk *desk);
 EINTERN void e_client_desk_iconify_skip_set(E_Client *ec, Eina_Bool skip);
 EINTERN Eina_Bool e_client_desk_iconify_skip_get(E_Client *ec);
 EINTERN Eina_Bool e_client_comp_grabbed_get(void);

diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 89a3a41..c9308ce 100644 (file)
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -1509,7 +1509,7 @@ _e_desk_show_begin(E_Desk *desk, int dx, int dy)
         if (e_client_util_ignored_get(ec) || (ec->desk->zone != desk->zone) || (ec->iconic)) continue;
         if (ec->moving)
           {
-             e_client_desk_set(ec, desk);
+             e_desk_client_add(desk, ec);
              evas_object_show(ec->frame);
              continue;
           }

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 7445928..ad5f19c 100644 (file)
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -338,7 +338,7 @@ _e_zone_cb_hook_client_focus_set(void *d, E_Client *ec)
    EINA_SAFETY_ON_NULL_RETURN(desk);
 
    if (!desk->visible && ec->sticky)
-     e_client_desk_set(ec, e_desk_current_get(zone));
+     e_desk_client_add(e_desk_current_get(zone), ec);
 }
 
 static void
@@ -362,7 +362,7 @@ _e_zone_cb_hook_client_uniconify(void *d, E_Client *ec)
 
    e_comp_wl_remote_surface_image_save_cancel(ec);
 
-   e_client_desk_set(ec, desk);
+   e_desk_client_add(desk, ec);
    not_raise = ec->exp_iconify.not_raise;
 
    ec->exp_iconify.by_client = 0;
@@ -478,7 +478,7 @@ _e_zone_cb_hook_client_stick(void *d, E_Client *ec)
    ec->sticky = 1;
    ec->hidden = 0;
 
-   e_client_desk_set(ec, desk);
+   e_desk_client_add(desk, ec);
 
    evas_object_smart_callback_call(ec->frame, "stick", NULL);
 
@@ -517,7 +517,7 @@ _e_zone_cb_hook_client_unstick(void *d, E_Client *ec)
    ec->hidden = ec->sticky = 0;
 
    curr_desk = e_desk_current_get(zone);
-   e_client_desk_set(ec, curr_desk);
+   e_desk_client_add(curr_desk, ec);
 
    evas_object_smart_callback_call(ec->frame, "unstick", NULL);
 
@@ -927,7 +927,7 @@ e_zone_desk_count_set(E_Zone *zone,
                   E_CLIENT_FOREACH(ec)
                     {
                        if (ec->desk == desk)
-                         e_client_desk_set(ec, new_desk);
+                         e_desk_client_add(new_desk, ec);
                     }
                   e_object_del(E_OBJECT(desk));
                }
@@ -945,7 +945,7 @@ e_zone_desk_count_set(E_Zone *zone,
                   E_CLIENT_FOREACH(ec)
                     {
                        if (ec->desk == desk)
-                         e_client_desk_set(ec, new_desk);
+                         e_desk_client_add(new_desk, ec);
                     }
                   e_object_del(E_OBJECT(desk));
                }
@@ -1775,7 +1775,7 @@ e_zone_client_add(E_Zone *zone, E_Client *ec)
    //        inside e_client_desk_set(). It makes the infinite loop calls(circular calls).
    //        e_client_desk_set() -> e_client_zone_set() -> e_zone_client_add() -> e_client_desk_set() -> ... and so on.
    if ((!ec->desk) || (ec->desk->zone != zone))
-     e_client_desk_set(ec, e_desk_current_get(zone));
+     e_desk_client_add(e_desk_current_get(zone), ec);
 
    e_client_res_change_geometry_save(ec);
    e_client_res_change_geometry_restore(ec);