diff options
| author | emersion <contact@emersion.fr> | 2018-12-09 11:50:28 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2019-01-24 12:12:55 +0100 |
| commit | 1150ff13ceeeb76ce17c8b7a8ca199230d7b87f9 (patch) | |
| tree | c18db038da3490a16c1cb281d7808263600d9277 /xwayland/selection | |
| parent | 4cb0697e576820774013f399c89fe85673e2f338 (diff) | |
| download | wlroots-1150ff13ceeeb76ce17c8b7a8ca199230d7b87f9.tar.xz | |
data-device: make sources inert, rename cancel to destroy
Diffstat (limited to 'xwayland/selection')
| -rw-r--r-- | xwayland/selection/incoming.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xwayland/selection/incoming.c b/xwayland/selection/incoming.c index e3f68ea7..290af0bf 100644 --- a/xwayland/selection/incoming.c +++ b/xwayland/selection/incoming.c @@ -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 = |