diff options
| author | Drew DeVault <sir@cmpwn.com> | 2019-01-24 09:48:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-24 09:48:26 -0500 |
| commit | 460a630a43c3aa914a84e2a2a0f879f8042d6c7f (patch) | |
| tree | 8059d8d549c88d4f6aba5d6af2bc9b3908d4627a /xwayland/selection | |
| parent | b1731134e2935d2840dd0cc60b9bce2ba9dbcb1f (diff) | |
| parent | a1f9d7ad9efbd248ceb85307a51e6dcf27f6bb25 (diff) | |
| download | wlroots-460a630a43c3aa914a84e2a2a0f879f8042d6c7f.tar.xz | |
Merge pull request #1427 from emersion/refactor-data-device
Refactor data-device
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 = |