From: Seunghun Lee Date: Thu, 26 Dec 2024 06:50:24 +0000 (+0900) Subject: e_comp_wl: Deprecate sh_v6 field X-Git-Tag: accepted/tizen/unified/20250116.075516~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0eb9dc28b953319fb2da5a14dbdb13a57f1c5281;p=platform%2Fupstream%2Fenlightenment.git e_comp_wl: Deprecate sh_v6 field It's unused. Change-Id: I212a533f0f8f2dbcea4eff5ea23ea9e9de97e1bc --- diff --git a/src/bin/server/e_xdg_shell_v6.c b/src/bin/server/e_xdg_shell_v6.c index 027815db33..bf006325ab 100644 --- a/src/bin/server/e_xdg_shell_v6.c +++ b/src/bin/server/e_xdg_shell_v6.c @@ -322,19 +322,11 @@ _e_xdg_toplevel_v6_role_init(E_Xdg_Toplevel_V6 *toplevel) { E_Client *ec = toplevel->ec; struct ds_xdg_surface_v6 *ds_xdg_surface = toplevel->ds_toplevel->base; - E_Comp_Wl_Client_Data *cdata; e_shell_e_client_shsurface_assign(ec, ds_xdg_surface->resource, &shell_xdg_toplevel_v6_api); - cdata = e_client_cdata_get(ec); - if (cdata) - { - cdata->sh_v6.res_role = toplevel->ds_toplevel->resource; - cdata->sh_v6.role = E_COMP_WL_SH_SURF_ROLE_TOPLV; - } - e_shell_e_client_toplevel_set(ec); e_comp_wl_shell_surface_ready(toplevel->ec); } @@ -709,17 +701,7 @@ _e_xdg_toplevel_v6_init(E_Xdg_Toplevel_V6 *toplevel) static void _e_xdg_toplevel_v6_finish(E_Xdg_Toplevel_V6 *toplevel) { - E_Client *ec = toplevel->ec; - E_Comp_Wl_Client_Data *cdata; - - cdata = e_client_cdata_get(ec); - if (cdata) - { - cdata->sh_v6.res_role = toplevel->ds_toplevel->resource; - cdata->sh_v6.role = E_COMP_WL_SH_SURF_ROLE_NONE; - } - - e_shell_e_client_destroy(ec); + e_shell_e_client_destroy(toplevel->ec); } static void diff --git a/src/include/e_comp_wl.h b/src/include/e_comp_wl.h index 97680c25df..cb0fdefe1b 100644 --- a/src/include/e_comp_wl.h +++ b/src/include/e_comp_wl.h @@ -505,7 +505,7 @@ struct _E_Comp_Wl_Client_Data { E_Comp_Wl_Sh_Surf_Role role; struct wl_resource *res_role; /* zxdg_toplevel_v6 or zxdg_popup_v6 */ - } sh_v6; + } E_DEPRECATED sh_v6; const char *role_name;