diff options
| author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-05-12 17:52:51 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-12 17:52:51 +1000 |
| commit | 4717c71da54a45f736bdfde04ee3f0db88918799 (patch) | |
| tree | fa511907ae4ca82d8ca68cc3a2be254359af091f /sway/desktop/wl_shell.c | |
| parent | 935bda0f336bb9ca45a7fb96d7ed5f08ef04432f (diff) | |
| parent | 2511adffc29996b64d01d85b3de31de9a2af9096 (diff) | |
Merge branch 'master' into fix-crash-on-fullscreen
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( return (struct sway_wl_shell_view *)view; } -static const char *get_prop(struct sway_view *view, enum sway_view_prop prop) { +static const char *get_string_prop(struct sway_view *view, enum sway_view_prop prop) { if (wl_shell_view_from_view(view) == NULL) { return NULL; } @@ -70,7 +70,7 @@ static void set_fullscreen(struct sway_view *view, bool fullscreen) { } static const struct sway_view_impl view_impl = { - .get_prop = get_prop, + .get_string_prop = get_string_prop, .configure = configure, .close = _close, .destroy = destroy, |