diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-04-04 22:12:32 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-04 22:12:32 -0400 |
commit | 21aedf15052df4e7f8ee72922fa0e214d690facc (patch) | |
tree | 42039b2d318ab944dd148990329b4a2cf94fd9a3 /sway/desktop/wl_shell.c | |
parent | Merge pull request #1707 from acrisci/transparency (diff) | |
parent | Use new wlr_*_surface_at functions (diff) | |
download | sway-21aedf15052df4e7f8ee72922fa0e214d690facc.tar.gz sway-21aedf15052df4e7f8ee72922fa0e214d690facc.tar.zst sway-21aedf15052df4e7f8ee72922fa0e214d690facc.zip |
Merge pull request #1732 from emersion/view-children
Update for wlroots#824
Diffstat (limited to 'sway/desktop/wl_shell.c')
-rw-r--r-- | sway/desktop/wl_shell.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/wl_shell.c b/sway/desktop/wl_shell.c index 6528a397..a470674d 100644 --- a/sway/desktop/wl_shell.c +++ b/sway/desktop/wl_shell.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include "log.h" | 12 | #include "log.h" |
13 | 13 | ||
14 | static bool assert_wl_shell(struct sway_view *view) { | 14 | static bool assert_wl_shell(struct sway_view *view) { |
15 | return sway_assert(view->type == SWAY_WL_SHELL_VIEW, | 15 | return sway_assert(view->type == SWAY_VIEW_WL_SHELL, |
16 | "Expecting wl_shell view!"); | 16 | "Expecting wl_shell view!"); |
17 | } | 17 | } |
18 | 18 | ||
@@ -97,7 +97,7 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) { | |||
97 | return; | 97 | return; |
98 | } | 98 | } |
99 | 99 | ||
100 | struct sway_view *view = view_create(SWAY_WL_SHELL_VIEW, &view_impl); | 100 | struct sway_view *view = view_create(SWAY_VIEW_WL_SHELL, &view_impl); |
101 | if (!sway_assert(view, "Failed to allocate view")) { | 101 | if (!sway_assert(view, "Failed to allocate view")) { |
102 | return; | 102 | return; |
103 | } | 103 | } |