summaryrefslogtreecommitdiff
path: root/src/wayland/meta-wayland-subsurface.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/wayland/meta-wayland-subsurface.c')
-rw-r--r--src/wayland/meta-wayland-subsurface.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/wayland/meta-wayland-subsurface.c b/src/wayland/meta-wayland-subsurface.c
index 27bd91f0c..d7f56b66e 100644
--- a/src/wayland/meta-wayland-subsurface.c
+++ b/src/wayland/meta-wayland-subsurface.c
@@ -355,11 +355,11 @@ is_valid_sibling (MetaWaylandSurface *surface,
}
static void
-subsurface_handle_pending_surface_destroyed (struct wl_listener *listener,
- void *data)
+subsurface_handle_pending_subsurface_destroyed (struct wl_listener *listener,
+ void *data)
{
MetaWaylandSubsurfacePlacementOp *op =
- wl_container_of (listener, op, surface_destroy_listener);
+ wl_container_of (listener, op, subsurface_destroy_listener);
op->surface = NULL;
}
@@ -378,7 +378,7 @@ void
meta_wayland_subsurface_placement_op_free (MetaWaylandSubsurfacePlacementOp *op)
{
if (op->surface)
- wl_list_remove (&op->surface_destroy_listener.link);
+ wl_list_remove (&op->subsurface_destroy_listener.link);
if (op->sibling)
wl_list_remove (&op->sibling_destroy_listener.link);
g_free (op);
@@ -396,12 +396,12 @@ queue_subsurface_placement (MetaWaylandSurface *surface,
op->placement = placement;
op->surface = surface;
op->sibling = sibling;
- op->surface_destroy_listener.notify =
- subsurface_handle_pending_surface_destroyed;
+ op->subsurface_destroy_listener.notify =
+ subsurface_handle_pending_subsurface_destroyed;
op->sibling_destroy_listener.notify =
subsurface_handle_pending_sibling_destroyed;
- wl_resource_add_destroy_listener (surface->resource,
- &op->surface_destroy_listener);
+ wl_resource_add_destroy_listener (surface->wl_subsurface,
+ &op->subsurface_destroy_listener);
wl_resource_add_destroy_listener (sibling->resource,
&op->sibling_destroy_listener);