aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-03-13 22:09:44 +0100
committeremersion <contact@emersion.fr>2018-03-13 22:09:44 +0100
commit149209b72ed069f3c6026e6bf7ffb4ffff0de190 (patch)
treed4924f9bf3f7b5b082cdb3483a074c1d222541f8 /include
parent657e5c8c0d162958f96c45069767acfa56075843 (diff)
xdg-shell-v6: rename toplevel and popup fields in wlr_xdg_surface_v6 for consistency
Diffstat (limited to 'include')
-rw-r--r--include/wlr/types/wlr_xdg_shell_v6.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h
index 9140fa64..2358feec 100644
--- a/include/wlr/types/wlr_xdg_shell_v6.h
+++ b/include/wlr/types/wlr_xdg_shell_v6.h
@@ -92,10 +92,9 @@ struct wlr_xdg_surface_v6 {
struct wl_list link; // wlr_xdg_client_v6::surfaces
enum wlr_xdg_surface_v6_role role;
- // TODO: the _state prefix should be dropped
union {
- struct wlr_xdg_toplevel_v6 *toplevel_state;
- struct wlr_xdg_popup_v6 *popup_state;
+ struct wlr_xdg_toplevel_v6 *toplevel;
+ struct wlr_xdg_popup_v6 *popup;
};
struct wl_list popups; // wlr_xdg_popup_v6::link