mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xwayland: Rename destroy_listener to be more explicit 

compositor_destroy_listener tells us exactly what it is.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone 2023-05-01 18:57:33 +01:00
parent 104676ec1f
commit 506901d918
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xwayland/launcher.c
View File

@ -221,9 +221,9 @@ static void
weston_xserver_destroy(struct wl_listener *l, void *data)
{
struct weston_xserver *wxs =
container_of(l, struct weston_xserver, destroy_listener);
container_of(l, struct weston_xserver, compositor_destroy_listener);
wl_list_remove(&wxs->destroy_listener.link);
wl_list_remove(&wxs->compositor_destroy_listener.link);
if (wxs->loop)
weston_xserver_shutdown(wxs);
@ -244,7 +244,7 @@ weston_xwayland_get(struct weston_compositor *compositor)
if (!listener)
return NULL;
wxs = wl_container_of(listener, wxs, destroy_listener);
wxs = wl_container_of(listener, wxs, compositor_destroy_listener);
return (struct weston_xwayland *)wxs;
}
@ -362,7 +362,7 @@ weston_module_init(struct weston_compositor *compositor)
wxs->compositor = compositor;
if (!weston_compositor_add_destroy_listener_once(compositor,
&wxs->destroy_listener,
&wxs->compositor_destroy_listener,
weston_xserver_destroy)) {
free(wxs);
return 0;
@ -397,7 +397,7 @@ weston_module_init(struct weston_compositor *compositor)
return 0;
out_free:
wl_list_remove(&wxs->destroy_listener.link);
wl_list_remove(&wxs->compositor_destroy_listener.link);
free(wxs);
return -1;
}

2
xwayland/xwayland.h
View File

@ -46,7 +46,7 @@ struct weston_xserver {
struct wl_client *client;
struct weston_compositor *compositor;
struct weston_wm *wm;
struct wl_listener destroy_listener;
struct wl_listener compositor_destroy_listener;
weston_xwayland_spawn_xserver_func_t spawn_func;
void *user_data;