diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2018-05-12 08:52:54 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2018-05-12 08:52:54 -0400 |
| commit | 32a572cecfd0f6072a78ce0a381a2f8365f9010a (patch) | |
| tree | ff3860acec8478bd3962145bafaa2bac19717bad /sway/desktop/xdg_shell_v6.c | |
| parent | Revert "Merge pull request #1953 from RyanDwyer/criteria-focused" (diff) | |
| download | sway-32a572cecfd0f6072a78ce0a381a2f8365f9010a.tar.gz sway-32a572cecfd0f6072a78ce0a381a2f8365f9010a.tar.zst sway-32a572cecfd0f6072a78ce0a381a2f8365f9010a.zip | |
Revert "Merge pull request #1943 from RyanDwyer/criteria-improvements"
This reverts commit 3e1bf721c69cb6df70c3dc3d3d4933e987339676, reversing
changes made to 2217518bd554d0f11dafa7ec4e8f35f2e4762fbd.
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 f685ef71..8ecb330d 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c | |||
| @@ -80,7 +80,7 @@ static struct sway_xdg_shell_v6_view *xdg_shell_v6_view_from_view( | |||
| 80 | return (struct sway_xdg_shell_v6_view *)view; | 80 | return (struct sway_xdg_shell_v6_view *)view; |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | static const char *get_string_prop(struct sway_view *view, enum sway_view_prop prop) { | 83 | static const char *get_prop(struct sway_view *view, enum sway_view_prop prop) { |
| 84 | if (xdg_shell_v6_view_from_view(view) == NULL) { | 84 | if (xdg_shell_v6_view_from_view(view) == NULL) { |
| 85 | return NULL; | 85 | return NULL; |
| 86 | } | 86 | } |
| @@ -158,7 +158,7 @@ static void destroy(struct sway_view *view) { | |||
| 158 | } | 158 | } |
| 159 | 159 | ||
| 160 | static const struct sway_view_impl view_impl = { | 160 | static const struct sway_view_impl view_impl = { |
| 161 | .get_string_prop = get_string_prop, | 161 | .get_prop = get_prop, |
| 162 | .configure = configure, | 162 | .configure = configure, |
| 163 | .set_activated = set_activated, | 163 | .set_activated = set_activated, |
| 164 | .set_fullscreen = set_fullscreen, | 164 | .set_fullscreen = set_fullscreen, |