mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-14 06:59:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

data-device: make sources inert, rename cancel to destroy

Browse source
This commit is contained in:
emersion 2018-12-09 11:50:28 +01:00
parent 4cb0697e57
commit 1150ff13ce
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
6 changed files with 45 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

7
xwayland/selection/incoming.c
View file

@ -203,17 +203,16 @@ static void data_source_send(struct wlr_data_source *wlr_source,
mime_type, fd);
}
static void data_source_cancel(struct wlr_data_source *wlr_source) {
static void data_source_destroy(struct wlr_data_source *wlr_source) {
struct x11_data_source *source =
data_source_from_wlr_data_source(wlr_source);
wlr_data_source_finish(&source->base);
wl_array_release(&source->mime_types_atoms);
free(source);
}
static const struct wlr_data_source_impl data_source_impl = {
.send = data_source_send,
.cancel = data_source_cancel,
.destroy = data_source_destroy,
};
struct x11_primary_selection_source {
@ -353,7 +352,7 @@ static void xwm_selection_get_targets(struct wlr_xwm_selection *selection) {
wlr_seat_request_set_selection(xwm->seat, &source->base,
wl_display_next_serial(xwm->xwayland->wl_display));
} else {
wlr_data_source_cancel(&source->base);
wlr_data_source_destroy(&source->base);
}
} else if (selection == &xwm->primary_selection) {
struct x11_primary_selection_source *source =