e_eom: use e_client_cdata_get

Change-Id: I1f1126332ffcf699b7a9a1d51b9e89382485e89b

diff --git a/src/bin/e_eom.c b/src/bin/e_eom.c
index 3f2f62718a7813cfc7525f1892c482a01b4aed85..ca857c7bcf24a1ef02000dcbd9badd28db37f5a2 100644 (file)
--- a/src/bin/e_eom.c
+++ b/src/bin/e_eom.c
@@ -353,6 +353,7 @@ _e_eom_output_by_ec_child_get(E_Client *ec)
 {
    E_EomOutputPtr eom_output = NULL;
    E_Client *parent_ec = NULL, *output_ec = NULL;
+   E_Comp_Wl_Client_Data *cdata = NULL, *parent_cdata = NULL;
    Eina_List *l;
 
    EINA_LIST_FOREACH(g_eom->eom_outputs, l, eom_output)
@@ -362,17 +363,19 @@ _e_eom_output_by_ec_child_get(E_Client *ec)
 
         if (output_ec == ec) return eom_output;
 
-        if (!ec->comp_data) continue;
-        if (!ec->comp_data->sub.data) continue;
+        cdata = e_client_cdata_get(ec);
+        if (!cdata) continue;
+        if (!cdata->sub.data) continue;
 
-        parent_ec = ec->comp_data->sub.data->parent;
+        parent_ec = cdata->sub.data->parent;
         while (parent_ec)
           {
              if (parent_ec == output_ec) return eom_output;
-             if (!parent_ec->comp_data) break;
-             if (!parent_ec->comp_data->sub.data) break;
+             parent_cdata = e_client_cdata_get(parent_ec);
+             if (!parent_cdata) break;
+             if (!parent_cdata->sub.data) break;
 
-             parent_ec = parent_ec->comp_data->sub.data->parent;
+             parent_ec = parent_cdata->sub.data->parent;
           }
      }
 
@@ -382,12 +385,12 @@ _e_eom_output_by_ec_child_get(E_Client *ec)
 static void
 _e_eom_output_send_configure_event(E_EomOutput *eom_output, E_Client *ec)
 {
-   E_Comp_Client_Data *cdata = NULL;
+   E_Comp_Wl_Client_Data *cdata;
    E_EomCompObjectInterceptHookData *hook_data = NULL;
    E_Comp_Object_Intercept_Hook *hook = NULL;
    int w, h;
 
-   cdata = ec->comp_data;
+   cdata = e_client_cdata_get(ec);
    EINA_SAFETY_ON_NULL_RETURN(cdata);
    EINA_SAFETY_ON_NULL_RETURN(cdata->shell.configure_send);
 
@@ -406,7 +409,7 @@ _e_eom_output_send_configure_event(E_EomOutput *eom_output, E_Client *ec)
 
    /* get the output size */
    e_output_size_get(eom_output->output, &w, &h);
-   cdata->shell.configure_send(ec->comp_data->shell.surface, 0, w, h);
+   cdata->shell.configure_send(cdata->shell.surface, 0, w, h);
 
    EOMINF("Send Configure Event for Presentation (%d X %d)", ec, eom_output->output, w, h);
 
@@ -452,22 +455,25 @@ _e_eom_client_get_current_by_ec_parrent(E_Client *ec)
    Eina_List *l;
    E_EomClientPtr client;
    E_Client *parent = NULL;
+   E_Comp_Wl_Client_Data *cdata = NULL, *parent_cdata = NULL;
 
-   if (!ec->comp_data || !ec->comp_data->sub.data)
+   cdata = e_client_cdata_get(ec);
+   if (!cdata || !cdata->sub.data)
      return NULL;
 
    EINA_LIST_FOREACH(g_eom->clients, l, client)
      {
-        parent = ec->comp_data->sub.data->parent;
+        parent = cdata->sub.data->parent;
         while (parent)
           {
              if (client->ec == parent)
                return client;
 
-             if (!parent->comp_data || !parent->comp_data->sub.data)
+             parent_cdata = e_client_cdata_get(parent);
+             if (!parent_cdata || !parent_cdata->sub.data)
                break;
 
-             parent = parent->comp_data->sub.data->parent;
+             parent = parent_cdata->sub.data->parent;
           }
      }