diff options
| author |  Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-13 08:16:36 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-14 11:38:09 +1000 |
| commit | 1e9aaa54a85e98d6b46ca594b4f50770f71047ea (patch) | |
| tree | cb6a2748d1c53dfc80f9faa5da7052790e668400 /sway/desktop/wl_shell.c | |
| parent | Actually fix swayidle (diff) | |
| download | sway-1e9aaa54a85e98d6b46ca594b4f50770f71047ea.tar.gz sway-1e9aaa54a85e98d6b46ca594b4f50770f71047ea.tar.zst sway-1e9aaa54a85e98d6b46ca594b4f50770f71047ea.zip | |
Revert "Revert "Merge pull request #1943 from RyanDwyer/criteria-improvements""
This reverts commit 32a572cecfd0f6072a78ce0a381a2f8365f9010a.
This reimplements the criteria overhaul in preparation for fixing a
known bug.
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 99e8947b..cb3774f7 100644 --- a/sway/desktop/wl_shell.c +++ b/sway/desktop/wl_shell.c | |||
| @@ -20,7 +20,7 @@ static struct sway_wl_shell_view *wl_shell_view_from_view( | |||
| 20 | return (struct sway_wl_shell_view *)view; | 20 | return (struct sway_wl_shell_view *)view; |
| 21 | } | 21 | } |
| 22 | 22 | ||
| 23 | static const char *get_prop(struct sway_view *view, enum sway_view_prop prop) { | 23 | static const char *get_string_prop(struct sway_view *view, enum sway_view_prop prop) { |
| 24 | if (wl_shell_view_from_view(view) == NULL) { | 24 | if (wl_shell_view_from_view(view) == NULL) { |
| 25 | return NULL; | 25 | return NULL; |
| 26 | } | 26 | } |
| @@ -70,7 +70,7 @@ static void set_fullscreen(struct sway_view *view, bool fullscreen) { | |||
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | static const struct sway_view_impl view_impl = { | 72 | static const struct sway_view_impl view_impl = { |
| 73 | .get_prop = get_prop, | 73 | .get_string_prop = get_string_prop, |
| 74 | .configure = configure, | 74 | .configure = configure, |
| 75 | .close = _close, | 75 | .close = _close, |
| 76 | .destroy = destroy, | 76 | .destroy = destroy, |