e_service_launcher: use e_client_cdate_get

Change-Id: I567aae2ff4fc9509401f239f3da9c2635f95ec99

diff --git a/src/bin/services/e_service_launcher.c b/src/bin/services/e_service_launcher.c
index b0d13fde29cf1abd14ab32ae7ac8883eff7aaf0f..4c64a84121db5990ecc72cd22ff0747da047c237 100644 (file)
--- a/src/bin/services/e_service_launcher.c
+++ b/src/bin/services/e_service_launcher.c
@@ -1231,17 +1231,18 @@ _launcher_cb_launching(struct wl_client *client EINA_UNUSED,
 static void
 _launcher_target_ec_queue_flush(E_Service_Launcher *lc)
 {
+   E_Comp_Wl_Client_Data *target_cdata = NULL;
    struct wayland_tbm_client_queue *cqueue;
 
    if (!e_comp_wl) return;
    if (!lc) return;
    if (!lc->target.ec) return;
-   if (!lc->target.ec->comp_data) return;
-   if (!lc->target.ec->comp_data->wl_surface) return;
+   target_cdata = e_client_cdata_get(lc->target.ec);
+   if (!target_cdata) return;
+   if (!target_cdata->wl_surface) return;
    if (e_object_is_del(E_OBJECT(lc->target.ec))) return;
 
-   cqueue = wayland_tbm_server_client_queue_get(e_comp_wl->tbm.server,
-                                                lc->target.ec->comp_data->wl_surface);
+   cqueue = wayland_tbm_server_client_queue_get(e_comp_wl->tbm.server, target_cdata->wl_surface);
    if (cqueue)
      wayland_tbm_server_client_queue_flush(cqueue);
 }
@@ -1326,7 +1327,8 @@ _launcher_cb_launch_done(struct wl_client *client EINA_UNUSED,
 
                   if (target_ec->first_mapped)
                     {
-                       ELOGF("LAUNCH", "SHOW real win (target->frame:%p, map:%d) by launcher service (win:0x%08zx, ec:%p).", target_ec, target_ec->frame, target_ec->comp_data->mapped, e_client_util_win_get(lc->ec), lc->ec);
+                       E_Comp_Wl_Client_Data *target_cdata = e_client_cdata_get(target_ec);
+                       ELOGF("LAUNCH", "SHOW real win (target->frame:%p, map:%d) by launcher service (win:0x%08zx, ec:%p).", target_ec, target_ec->frame, target_cdata->mapped, e_client_util_win_get(lc->ec), lc->ec);
                        e_comp_object_signal_emit(target_ec->frame, "e,action,launch_real,done", "e");
                     }
                   e_comp_object_signal_emit(target_ec->frame, "e,action,launch,done", "e");
@@ -1383,6 +1385,7 @@ static E_Client *
 _launcher_handler_rsm_provider_client_find(E_Client *rsm_consumer_ec)
 {
    E_Client *prov_ec = NULL;
+   E_Comp_Wl_Client_Data *prov_cdata = NULL;
    Eina_List *tzrs_provs, *l;
    E_Service_Launcher *lc;
 
@@ -1397,7 +1400,8 @@ _launcher_handler_rsm_provider_client_find(E_Client *rsm_consumer_ec)
         if (!prov_ec->remote_surface.provider) continue;
         if (prov_ec->visible) continue;
         if (evas_object_visible_get(prov_ec->frame)) continue;
-        if (prov_ec->comp_data->mapped) continue;
+        prov_cdata = e_client_cdata_get(prov_ec);
+        if (prov_cdata->mapped) continue;
         if (!(lc = _launcher_handler_launcher_find(prov_ec))) continue;
         if (!lc->launched_ec) continue;