e_service_cbhm: use e_client_cdata_get

Change-Id: Icc427bf13f563e225f3f8fa2e45f68ae23d1cf96

diff --git a/src/bin/services/e_service_cbhm.c b/src/bin/services/e_service_cbhm.c
index 13ebc39f78f551940a6a2e25575fc4b7f48a0c92..3f52d24259559881367a2a9697cdc6aa5c4b09f7 100644 (file)
--- a/src/bin/services/e_service_cbhm.c
+++ b/src/bin/services/e_service_cbhm.c
@@ -35,6 +35,7 @@ _cbhm_cb_evas_show(void *d, Evas *evas EINA_UNUSED, Evas_Object *obj, void *even
 {
    E_Policy_Cbhm *cbhm;
    E_Client *ec;
+   E_Comp_Wl_Client_Data *cdata;
 
    cbhm = d;
    if (EINA_UNLIKELY(!cbhm))
@@ -47,8 +48,8 @@ _cbhm_cb_evas_show(void *d, Evas *evas EINA_UNUSED, Evas_Object *obj, void *even
    if (ec->frame != obj)
      return;
 
-   if ((!cbhm->show_block) &&
-       (ec->comp_data->mapped))
+   cdata = e_client_cdata_get(ec);
+   if ((!cbhm->show_block) && (cdata->mapped))
      cbhm->show_block = EINA_TRUE;
 }
 
@@ -171,6 +172,7 @@ EINTERN void
 e_service_cbhm_client_set(E_Client *ec)
 {
    E_Policy_Cbhm *cbhm;
+   E_Comp_Wl_Client_Data *cdata;
 
    if (EINA_UNLIKELY(!ec))
      {
@@ -207,7 +209,8 @@ e_service_cbhm_client_set(E_Client *ec)
    // set skip iconify
    ec->exp_iconify.skip_iconify = 1;
 
-   e_comp_wl->selection.cbhm = ec->comp_data->surface;
+   cdata = e_client_cdata_get(ec);
+   e_comp_wl->selection.cbhm = cdata->surface;
    e_client_window_role_set(ec, "cbhm");
    e_policy_conformant_part_add(ec);