diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-12-27 07:56:28 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-27 07:56:28 -0800 |
| commit | 622d9e1603dd7ed2b7b2fc73265cd05f614ef8da (patch) | |
| tree | 0abde2b463904c40eeaf06b7a1b93ec36f276438 | |
| parent | 373def44468e0c919031a6ffe3049f91680e05ca (diff) | |
| parent | 2f7e435c6f2c7e4ace4f2566677d8730531985c8 (diff) | |
| download | sway-622d9e1603dd7ed2b7b2fc73265cd05f614ef8da.tar.xz | |
Merge pull request #1538 from acrisci/desktop-shell-surface-commit
desktop: use wlr-surface commit
| -rw-r--r-- | sway/desktop/wl_shell.c | 4 | ||||
| -rw-r--r-- | sway/desktop/xdg_shell_v6.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sway/desktop/wl_shell.c b/sway/desktop/wl_shell.c index e7150bf3..a7bb8eb5 100644 --- a/sway/desktop/wl_shell.c +++ b/sway/desktop/wl_shell.c @@ -114,7 +114,9 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) { // - Criteria sway_surface->commit.notify = handle_commit; - wl_signal_add(&shell_surface->events.commit, &sway_surface->commit); + wl_signal_add(&shell_surface->surface->events.commit, + &sway_surface->commit); + sway_surface->destroy.notify = handle_destroy; wl_signal_add(&shell_surface->events.destroy, &sway_surface->destroy); diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index 015cc9d0..5ff19f7e 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c @@ -120,7 +120,8 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) { // - Criteria sway_surface->commit.notify = handle_commit; - wl_signal_add(&xdg_surface->events.commit, &sway_surface->commit); + wl_signal_add(&xdg_surface->surface->events.commit, &sway_surface->commit); + sway_surface->destroy.notify = handle_destroy; wl_signal_add(&xdg_surface->events.destroy, &sway_surface->destroy); |