[mutter/wayland] wayland: Rename resource_destroy_cb to wl_surface_destructor
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wayland] wayland: Rename resource_destroy_cb to wl_surface_destructor
- Date: Tue, 18 Feb 2014 00:23:06 +0000 (UTC)
commit 2e7a56a28fc3596a6ec11c1d95b9676c6019941c
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Mon Feb 17 19:10:25 2014 -0500
wayland: Rename resource_destroy_cb to wl_surface_destructor
So it doesn't seem like a wl_listener callback.
src/wayland/meta-wayland-surface.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index a63bc92..496a6bf 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -615,7 +615,7 @@ destroy_window (MetaWaylandSurface *surface)
}
static void
-meta_wayland_surface_resource_destroy_cb (struct wl_resource *resource)
+wl_surface_destructor (struct wl_resource *resource)
{
MetaWaylandSurface *surface = wl_resource_get_user_data (resource);
@@ -652,14 +652,13 @@ meta_wayland_surface_create (MetaWaylandCompositor *compositor,
surface->compositor = compositor;
surface->resource = wl_resource_create (client, &wl_surface_interface, version, id);
- wl_resource_set_implementation (surface->resource, &meta_wayland_surface_interface, surface,
- meta_wayland_surface_resource_destroy_cb);
-
- double_buffered_state_init (&surface->pending);
+ wl_resource_set_implementation (surface->resource, &meta_wayland_surface_interface, surface,
wl_surface_destructor);
surface->buffer_destroy_listener.notify = surface_handle_buffer_destroy;
-
surface->surface_actor = g_object_ref_sink (meta_surface_actor_new ());
+
+ double_buffered_state_init (&surface->pending);
+
return surface;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]