diff --git a/src/wayland/meta-wayland-pointer-constraints.c b/src/wayland/meta-wayland-pointer-constraints.c index 41353c946..2684d6925 100644 --- a/src/wayland/meta-wayland-pointer-constraints.c +++ b/src/wayland/meta-wayland-pointer-constraints.c @@ -322,7 +322,7 @@ meta_wayland_pointer_constraint_new (MetaWaylandSurface *su if (region) { constraint->region = - mtk_region_copy (meta_wayland_region_peek_cairo_region (region)); + mtk_region_copy (meta_wayland_region_peek_region (region)); } else { @@ -816,7 +816,7 @@ meta_wayland_pointer_constraint_set_pending_region (MetaWaylandPointerConstraint if (region) { constraint_pending->region = - mtk_region_copy (meta_wayland_region_peek_cairo_region (region)); + mtk_region_copy (meta_wayland_region_peek_region (region)); } } diff --git a/src/wayland/meta-wayland-region.c b/src/wayland/meta-wayland-region.c index 1fcc47c5f..8a1f188fa 100644 --- a/src/wayland/meta-wayland-region.c +++ b/src/wayland/meta-wayland-region.c @@ -98,7 +98,7 @@ meta_wayland_region_create (MetaWaylandCompositor *compositor, } MtkRegion * -meta_wayland_region_peek_cairo_region (MetaWaylandRegion *region) +meta_wayland_region_peek_region (MetaWaylandRegion *region) { return region->region; } diff --git a/src/wayland/meta-wayland-region.h b/src/wayland/meta-wayland-region.h index 5840fdf0d..970fcf02d 100644 --- a/src/wayland/meta-wayland-region.h +++ b/src/wayland/meta-wayland-region.h @@ -32,4 +32,4 @@ MetaWaylandRegion * meta_wayland_region_create (MetaWaylandCompositor *composito struct wl_resource *compositor_resource, guint32 id); -MtkRegion * meta_wayland_region_peek_cairo_region (MetaWaylandRegion *region); +MtkRegion * meta_wayland_region_peek_region (MetaWaylandRegion *region); diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c index 5e632c1a9..cc09678d0 100644 --- a/src/wayland/meta-wayland-surface.c +++ b/src/wayland/meta-wayland-surface.c @@ -1108,8 +1108,8 @@ wl_surface_set_opaque_region (struct wl_client *client, if (region_resource) { MetaWaylandRegion *region = wl_resource_get_user_data (region_resource); - MtkRegion *cr_region = meta_wayland_region_peek_cairo_region (region); - pending->opaque_region = mtk_region_copy (cr_region); + MtkRegion *mtk_region = meta_wayland_region_peek_region (region); + pending->opaque_region = mtk_region_copy (mtk_region); } pending->opaque_region_set = TRUE; } @@ -1126,8 +1126,8 @@ wl_surface_set_input_region (struct wl_client *client, if (region_resource) { MetaWaylandRegion *region = wl_resource_get_user_data (region_resource); - MtkRegion *cr_region = meta_wayland_region_peek_cairo_region (region); - pending->input_region = mtk_region_copy (cr_region); + MtkRegion *mtk_region = meta_wayland_region_peek_region (region); + pending->input_region = mtk_region_copy (mtk_region); } pending->input_region_set = TRUE; } diff --git a/src/wayland/meta-wayland-surface.h b/src/wayland/meta-wayland-surface.h index 03e1f67bb..4f621ade8 100644 --- a/src/wayland/meta-wayland-surface.h +++ b/src/wayland/meta-wayland-surface.h @@ -345,7 +345,7 @@ void meta_wayland_surface_get_absolute_coordinates (MetaWaylandSu MetaWaylandSurface * meta_wayland_surface_role_get_surface (MetaWaylandSurfaceRole *role); -MtkRegion * meta_wayland_surface_calculate_input_region (MetaWaylandSurface *surface); +MtkRegion * meta_wayland_surface_calculate_input_region (MetaWaylandSurface *surface); gboolean meta_wayland_surface_begin_grab_op (MetaWaylandSurface *surface,