aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-11-04 13:11:18 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-11-04 13:11:18 +0000
commitdbb51ed4c920fa9e48e7065fa8ae528dd8e4e582 (patch)
tree16fb790bc3e4fdfc0a2ef3be6935838d5e112af7
parentinput: remove unneeded(?) term_reset_view() calls (diff)
selection: we don't set user data on primary/clipboard data sources
-rw-r--r--selection.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/selection.c b/selection.c
index 81912b34..be2310a5 100644
--- a/selection.c
+++ b/selection.c
@@ -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;