e_maximize: remove the use of ec->desk

The desk variable at e_client will be deprecated.

Change-Id: I09550e72723f2f7d8e444e6c252360d135638414

diff --git a/src/bin/e_maximize.c b/src/bin/e_maximize.c
index 5f79eeecca6d84f595caecf29959a98254c58f7f..9b387becaf27c2e3cf00c3ca50e398e8a38dea6b 100644 (file)
--- a/src/bin/e_maximize.c
+++ b/src/bin/e_maximize.c
@@ -146,14 +146,19 @@ e_maximize_client_client_fill(E_Client *ec, int *x1, int *yy1, int *x2, int *y2,
    E_Maximize_Rect *r;
    E_Client *ec2;
    E_Zone *zone, *ec2_zone;
+   E_Desk *desk, *ec2_desk;
 
    zone = e_comp_zone_find_by_ec(ec);
    if (!zone) return;
 
+   desk = e_zone_desk_find_by_ec(zone, ec);
+   if (!desk) return;
+
    E_CLIENT_FOREACH(ec2)
      {
         ec2_zone = e_comp_zone_find_by_ec(ec2);
-        if ((ec2_zone != zone) || (ec == ec2) || (ec2->desk != ec->desk && !ec2->sticky) || (ec2->iconic))
+        ec2_desk = e_zone_desk_find_by_ec(ec2_zone, ec);
+        if ((ec2_zone != zone) || (ec == ec2) || (ec2_desk != desk && !ec2->sticky) || (ec2->iconic))
           continue;
         OBSTACLE(ec2->x, ec2->y, ec2->x + ec2->w, ec2->y + ec2->h);
      }