selection: we don't set user data on primary/clipboard data sources

This commit is contained in:
Daniel Eklöf 2019-11-04 14:11:18 +01:00
parent 739c5cf7f0
commit dbb51ed4c9
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F

View file

@ -407,7 +407,8 @@ send(void *data, struct wl_data_source *wl_data_source, const char *mime_type,
static void
cancelled(void *data, struct wl_data_source *wl_data_source)
{
struct wl_clipboard *clipboard = wl_data_source_get_user_data(wl_data_source);
struct wayland *wayl = data;
struct wl_clipboard *clipboard = &wayl->clipboard;
assert(clipboard->data_source == wl_data_source);
wl_data_source_destroy(clipboard->data_source);
@ -497,9 +498,8 @@ static void
primary_cancelled(void *data,
struct zwp_primary_selection_source_v1 *zwp_primary_selection_source_v1)
{
struct wl_primary *primary = zwp_primary_selection_source_v1_get_user_data(
zwp_primary_selection_source_v1);
//assert(primary->data_source == zwp_primary_selection_source_v1);
struct wayland *wayl = data;
struct wl_primary *primary = &wayl->primary;
zwp_primary_selection_source_v1_destroy(primary->data_source);
primary->data_source = NULL;