e_output: use e_client_cdata_get

Change-Id: I2fe492cc4050285a48a83d6d4dcd5eeb9bc36cae

diff --git a/src/bin/e_output.c b/src/bin/e_output.c
index e84598ccbe18017ea57818f74152144b613c2b49..637c2870a1e02b06604b1417a962416f82cafd0c 100644 (file)
--- a/src/bin/e_output.c
+++ b/src/bin/e_output.c
@@ -226,7 +226,7 @@ _e_output_zoom_top_visible_ec_get()
         if (!ec->frame) continue;
         if (!evas_object_visible_get(ec->frame)) continue;
         /* if ec is subsurface, skip this */
-        cdata = (E_Comp_Wl_Client_Data *)ec->comp_data;
+        cdata = e_client_cdata_get(ec);
         if (cdata && cdata->sub.data) continue;
 
         return ec;
@@ -579,7 +579,7 @@ _e_output_top_visible_ec_get()
         if (!ec->frame) continue;
         if (!evas_object_visible_get(ec->frame)) continue;
         /* if ec is subsurface, skip this */
-        cdata = (E_Comp_Wl_Client_Data *)ec->comp_data;
+        cdata = e_client_cdata_get(ec);
         if (cdata && cdata->sub.data) continue;
 
         return ec;
@@ -704,7 +704,7 @@ _e_output_visible_client_check(E_Output *output)
    Eina_Bool found = EINA_FALSE;
    int x, y, w, h;
    E_Zone *zone = NULL;
-   E_Comp_Wl_Client_Data *cdata = NULL;
+   E_Comp_Wl_Client_Data *cdata;
    E_Output *zone_output = NULL;
    Eina_List *l;
 
@@ -724,7 +724,7 @@ _e_output_visible_client_check(E_Output *output)
               if (ec->is_cursor) continue;
               if (!ec->visible) continue;
               if (!evas_object_visible_get(ec->frame)) continue;
-              cdata = (E_Comp_Wl_Client_Data *)ec->comp_data;
+              cdata = e_client_cdata_get(ec);
               if (cdata && cdata->sub.data) continue; /* skip subsurface */
               if (cdata && !cdata->mapped) continue;
               if (ec->iconic) continue;
@@ -753,18 +753,18 @@ static void
 _e_output_client_resize(int w, int h)
 {
    E_Client *ec = NULL;
-   E_Comp_Client_Data *cdata = NULL;
+   E_Comp_Wl_Client_Data *cdata;
 
    E_CLIENT_FOREACH(ec)
      {
         if ((ec->visible && !ec->input_only) ||
            (e_client_util_name_get(ec) != NULL && !ec->input_only))
           {
-             cdata = ec->comp_data;
+             cdata = e_client_cdata_get(ec);
              if (cdata == NULL) continue;
              if (cdata->shell.configure_send == NULL) continue;
 
-             cdata->shell.configure_send(ec->comp_data->shell.surface, 0, w ,h);
+             cdata->shell.configure_send(cdata->shell.surface, 0, w ,h);
           }
      }
 }