aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Primak <vyivel@eclair.cafe>2022-09-14 14:27:47 +0300
committerSimon Ser <contact@emersion.fr>2023-04-14 17:00:17 +0200
commitfac7a5cc9d30cef8c17b8fccb31a28b02ff4f2e7 (patch)
tree1a968a0758472952e318940818eaea092baf8cab
parent49435cb27b05c141a29f819fec2faa275ce90b3d (diff)
subcompositor: use bad_parent error
-rw-r--r--meson.build2
-rw-r--r--types/wlr_subcompositor.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index d9587028..29b103aa 100644
--- a/meson.build
+++ b/meson.build
@@ -103,7 +103,7 @@ internal_config = configuration_data()
wayland_project_options = ['tests=false', 'documentation=false']
wayland_server = dependency('wayland-server',
- version: '>=1.21',
+ version: '>=1.22',
fallback: 'wayland',
default_options: wayland_project_options,
)
diff --git a/types/wlr_subcompositor.c b/types/wlr_subcompositor.c
index 29e7d2af..c18a2335 100644
--- a/types/wlr_subcompositor.c
+++ b/types/wlr_subcompositor.c
@@ -429,7 +429,7 @@ static void subcompositor_handle_get_subsurface(struct wl_client *client,
if (wlr_surface_get_root_surface(parent) == surface) {
wl_resource_post_error(resource,
- WL_SUBCOMPOSITOR_ERROR_BAD_SURFACE,
+ WL_SUBCOMPOSITOR_ERROR_BAD_PARENT,
"wl_subsurface@%" PRIu32
" cannot be a parent of itself or its ancestor", id);
return;