e_zone: remove the use of ec->desk

The desk variable at e_client will be deprecated.

Change-Id: I5fb944a25639a7609c7d2eb23f6e0c93a09bbcca

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index b46dd940031b1b66000b8a76f6c70373d22f55cf..46fb41255b4e89302ae098f48ab6030906d5f5fa 100644 (file)
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -289,6 +289,7 @@ _e_zone_client_maximize(E_Zone *zone, E_Desk *desk, E_Client *ec, E_Maximize max
 static void
 _e_zone_client_apply_auto_placement(E_Zone *zone, E_Client *ec)
 {
+   E_Desk *desk;
    Eina_List *skiplist = NULL;
    int new_x, new_y, t = 0;
    int type;
@@ -328,8 +329,9 @@ _e_zone_client_apply_auto_placement(E_Zone *zone, E_Client *ec)
      {
         type = 2;
         skiplist = eina_list_append(skiplist, ec);
-        if (ec->desk)
-          e_place_desk_region_smart(ec->desk, skiplist,
+        desk = e_zone_desk_find_by_ec(zone, ec);
+        if (desk)
+          e_place_desk_region_smart(desk, skiplist,
                                     ec->x, ec->y, ec->w, ec->h,
                                     &new_x, &new_y);
         else
@@ -1490,7 +1492,7 @@ e_zone_desk_count_set(E_Zone *zone,
                       int y_count)
 {
    E_Desk **new_desks;
-   E_Desk *desk, *new_desk;
+   E_Desk *desk, *new_desk, *ec_desk;
    E_Client *ec;
    E_Event_Zone_Desk_Count_Set *ev;
    int x, y, xx, yy, moved, nx, ny;
@@ -1542,7 +1544,8 @@ e_zone_desk_count_set(E_Zone *zone,
 
                   E_CLIENT_FOREACH(ec)
                     {
-                       if (ec->desk == desk)
+                       ec_desk = e_zone_desk_find_by_ec(zone, ec);
+                       if (ec_desk == desk)
 #ifdef REFACTOR_ZONE_DESK
                          e_desk_client_add(new_desk, ec);
 #else
@@ -1564,7 +1567,8 @@ e_zone_desk_count_set(E_Zone *zone,
 
                   E_CLIENT_FOREACH(ec)
                     {
-                       if (ec->desk == desk)
+                       ec_desk = e_zone_desk_find_by_ec(zone, ec);
+                       if (ec_desk == desk)
 #ifdef REFACTOR_ZONE_DESK
                          e_desk_client_add(new_desk, ec);
 #else