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/xdg_shell_v6.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/xdg_shell_v6.c')
| -rw-r--r-- | sway/desktop/xdg_shell_v6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index e9051b6c..d098c797 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c | |||
| @@ -72,7 +72,7 @@ static struct sway_xdg_shell_v6_view *xdg_shell_v6_view_from_view( | |||
| 72 | return (struct sway_xdg_shell_v6_view *)view; | 72 | return (struct sway_xdg_shell_v6_view *)view; |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | static const char *get_prop(struct sway_view *view, enum sway_view_prop prop) { | 75 | static const char *get_string_prop(struct sway_view *view, enum sway_view_prop prop) { |
| 76 | if (xdg_shell_v6_view_from_view(view) == NULL) { | 76 | if (xdg_shell_v6_view_from_view(view) == NULL) { |
| 77 | return NULL; | 77 | return NULL; |
| 78 | } | 78 | } |
| @@ -150,7 +150,7 @@ static void destroy(struct sway_view *view) { | |||
| 150 | } | 150 | } |
| 151 | 151 | ||
| 152 | static const struct sway_view_impl view_impl = { | 152 | static const struct sway_view_impl view_impl = { |
| 153 | .get_prop = get_prop, | 153 | .get_string_prop = get_string_prop, |
| 154 | .configure = configure, | 154 | .configure = configure, |
| 155 | .set_activated = set_activated, | 155 | .set_activated = set_activated, |
| 156 | .set_fullscreen = set_fullscreen, | 156 | .set_fullscreen = set_fullscreen, |