diff options
author | Markus Ongyerth <ongy@ongy.net> | 2018-07-14 10:29:22 +0200 |
---|---|---|
committer | Markus Ongyerth <ongy@ongy.net> | 2018-07-14 10:29:22 +0200 |
commit | 9a6f77fc2ceb59f4b5bcd1e1f8c00aa974b5192b (patch) | |
tree | 808d0e88c28561d5853be09f7c2ab7968ce70e3f /include | |
parent | 74ca2f8fcf10f5b00b4a3eeb121e418e1b5212e0 (diff) |
tablet-v2: fix merge commits and test again
There were a few issues after rebase, that the merge algorithm didn't
throw at my face:
wlr_output did a check on the actual role, not a string anymore, so that
had to go to allow tablet-v2 to set cursor surfaces.
A few L_DEBUG/L_ERRORs were still around
There was a user-after-free in tablet-group free()ing, probably after
insufficient testing from a previous feedback pass
Diffstat (limited to 'include')
-rw-r--r-- | include/wlr/types/wlr_seat.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h index 1c7a1472..92d0a233 100644 --- a/include/wlr/types/wlr_seat.h +++ b/include/wlr/types/wlr_seat.h @@ -540,6 +540,4 @@ bool wlr_seat_validate_grab_serial(struct wlr_seat *seat, uint32_t serial); struct wlr_seat_client *wlr_seat_client_from_resource( struct wl_resource *resource); -bool wlr_surface_is_pointer_cursor(struct wlr_surface *surface); - #endif |