diff options
author | emersion <contact@emersion.fr> | 2017-11-20 21:15:58 +0100 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2017-11-20 21:15:58 +0100 |
commit | 151901123f0f59d0a05b5494e91d5425c99e6b1a (patch) | |
tree | 3c4f5cdb49dee27867fca017a89ff54262011822 /rootston/xdg_shell_v6.c | |
parent | 016744ef4d2692c800d613e40fbf5d6267fab2e9 (diff) | |
parent | becd75fd2ebd31fec9fdcf9cc2f37c5957d31b37 (diff) |
Merge branch 'master' into refactor-wlr-list
Diffstat (limited to 'rootston/xdg_shell_v6.c')
-rw-r--r-- | rootston/xdg_shell_v6.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c index 6517c8b4..ea19753b 100644 --- a/rootston/xdg_shell_v6.c +++ b/rootston/xdg_shell_v6.c @@ -161,11 +161,11 @@ static void handle_commit(struct wl_listener *listener, void *data) { static void handle_destroy(struct wl_listener *listener, void *data) { struct roots_xdg_surface_v6 *roots_xdg_surface = wl_container_of(listener, roots_xdg_surface, destroy); - view_teardown(roots_xdg_surface->view); wl_list_remove(&roots_xdg_surface->commit.link); wl_list_remove(&roots_xdg_surface->destroy.link); wl_list_remove(&roots_xdg_surface->request_move.link); wl_list_remove(&roots_xdg_surface->request_resize.link); + wl_list_remove(&roots_xdg_surface->view->link); view_destroy(roots_xdg_surface->view); free(roots_xdg_surface); } @@ -219,9 +219,9 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) { view->move_resize = move_resize; view->maximize = maximize; view->close = close; - view->desktop = desktop; roots_surface->view = view; - wlr_list_add(desktop->views, view); + view_init(view, desktop); + wl_list_insert(&desktop->views, &view->link); view_setup(view); } |