diff options
author | Alexander Orzechowski <orzechowski.alexander@gmail.com> | 2022-03-04 19:23:27 -0500 |
---|---|---|
committer | Kirill Primak <vyivel@eclair.cafe> | 2024-01-18 18:36:54 +0300 |
commit | dbd2fbf4301d441be4f9a04a1df6d93c81c361f6 (patch) | |
tree | ed1e1da485e28529bf28922c08b021a7bc1856ac /sway/desktop | |
parent | desktop: Rename layers to shell_layers (diff) | |
download | sway-dbd2fbf4301d441be4f9a04a1df6d93c81c361f6.tar.gz sway-dbd2fbf4301d441be4f9a04a1df6d93c81c361f6.tar.zst sway-dbd2fbf4301d441be4f9a04a1df6d93c81c361f6.zip |
view: init function should return a success bool
Diffstat (limited to 'sway/desktop')
-rw-r--r-- | sway/desktop/xdg_shell.c | 5 | ||||
-rw-r--r-- | sway/desktop/xwayland.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index 63a0835b..11c112be 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c | |||
@@ -548,7 +548,10 @@ void handle_xdg_shell_toplevel(struct wl_listener *listener, void *data) { | |||
548 | return; | 548 | return; |
549 | } | 549 | } |
550 | 550 | ||
551 | view_init(&xdg_shell_view->view, SWAY_VIEW_XDG_SHELL, &view_impl); | 551 | if (!view_init(&xdg_shell_view->view, SWAY_VIEW_XDG_SHELL, &view_impl)) { |
552 | free(xdg_shell_view); | ||
553 | return; | ||
554 | } | ||
552 | xdg_shell_view->view.wlr_xdg_toplevel = xdg_toplevel; | 555 | xdg_shell_view->view.wlr_xdg_toplevel = xdg_toplevel; |
553 | 556 | ||
554 | xdg_shell_view->map.notify = handle_map; | 557 | xdg_shell_view->map.notify = handle_map; |
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 2c6184fd..8f79b5e7 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c | |||
@@ -796,7 +796,10 @@ struct sway_xwayland_view *create_xwayland_view(struct wlr_xwayland_surface *xsu | |||
796 | return NULL; | 796 | return NULL; |
797 | } | 797 | } |
798 | 798 | ||
799 | view_init(&xwayland_view->view, SWAY_VIEW_XWAYLAND, &view_impl); | 799 | if (!view_init(&xwayland_view->view, SWAY_VIEW_XWAYLAND, &view_impl)) { |
800 | free(xwayland_view); | ||
801 | return NULL; | ||
802 | } | ||
800 | xwayland_view->view.wlr_xwayland_surface = xsurface; | 803 | xwayland_view->view.wlr_xwayland_surface = xsurface; |
801 | 804 | ||
802 | wl_signal_add(&xsurface->events.destroy, &xwayland_view->destroy); | 805 | wl_signal_add(&xsurface->events.destroy, &xwayland_view->destroy); |