From 9dadfb53526bc97d62dc01c165e8b6f722f7ea5a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Mon, 8 Jul 2013 13:49:36 -0400 Subject: [PATCH] compositor: Eliminate marshalling warning for leave events 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. --- src/compositor.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/compositor.c b/src/compositor.c index a02da8b..92d89a7 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -1002,9 +1002,6 @@ struct weston_frame_callback { WL_EXPORT void 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); 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); - surface->resource = NULL; weston_surface_destroy(surface); } -- 2.7.4