aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Primak <vyivel@eclair.cafe>2022-11-29 17:55:04 +0300
committerKirill Primak <vyivel@eclair.cafe>2022-12-07 13:54:31 +0000
commit79248e4961d49da1858917a902ba6b8fcc0bead1 (patch)
tree1edb346ba54de54892bc2c20991fc77a1449cc02
parent90a6c7b7e18950bfe393f9e921e525e3f1f4073e (diff)
xdg-shell: use defunct_role_object error
-rw-r--r--protocol/meson.build2
-rw-r--r--types/xdg_shell/wlr_xdg_surface.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/protocol/meson.build b/protocol/meson.build
index 1928df9f..965dc342 100644
--- a/protocol/meson.build
+++ b/protocol/meson.build
@@ -1,5 +1,5 @@
wayland_protos = dependency('wayland-protocols',
- version: '>=1.28',
+ version: '>=1.31',
fallback: 'wayland-protocols',
default_options: ['tests=false'],
)
diff --git a/types/xdg_shell/wlr_xdg_surface.c b/types/xdg_shell/wlr_xdg_surface.c
index 0ba3c98e..f554eb6e 100644
--- a/types/xdg_shell/wlr_xdg_surface.c
+++ b/types/xdg_shell/wlr_xdg_surface.c
@@ -236,8 +236,9 @@ static void xdg_surface_handle_destroy(struct wl_client *client,
}
if (surface->role != WLR_XDG_SURFACE_ROLE_NONE) {
- wlr_log(WLR_ERROR, "Tried to destroy an xdg_surface before its role "
- "object");
+ wl_resource_post_error(resource,
+ XDG_SURFACE_ERROR_DEFUNCT_ROLE_OBJECT,
+ "surface was destroyed before its role object");
return;
}