fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-05 15:48:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

compositor: Eliminate marshalling warning for leave events

Browse source 
Don't NULL the resource pointer before calling weston_surface_destroy().
We use to have more of a distinction between compositor created surfaces
and client surfaces, and weston_surface_destroy couldn't be used for
client surfaces.  Now it all goes through weston_surface_destroy() and
we can remove the assert and the NULL-ing of resource, which caused the
marshalling warning.
This commit is contained in:
Kristian Høgsberg 2013-07-08 13:49:36 -04:00
parent 708b8af018
commit 9dadfb5352
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/compositor.c
View file

@ -1002,9 +1002,6 @@ struct weston_frame_callback {
WL_EXPORT void WL_EXPORT void
weston_surface_destroy(struct weston_surface *surface) weston_surface_destroy(struct weston_surface *surface)
{ {
/* Not a valid way to destroy a client surface */
assert(surface->resource == NULL);
wl_signal_emit(&surface->destroy_signal, &surface->resource); wl_signal_emit(&surface->destroy_signal, &surface->resource);
struct weston_compositor *compositor = surface->compositor; struct weston_compositor *compositor = surface->compositor;
@ -1053,7 +1050,6 @@ destroy_surface(struct wl_resource *resource)
{ {
struct weston_surface *surface = wl_resource_get_user_data(resource); struct weston_surface *surface = wl_resource_get_user_data(resource);
surface->resource = NULL;
weston_surface_destroy(surface); weston_surface_destroy(surface);
} }