diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-12-01 17:30:29 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-12-01 17:30:29 +0000 |
| commit | 1f6a663bed153dafae05f4af96cf80864ac83fc5 (patch) | |
| tree | 5f1604337f92cfbc70332abc980edc914fa05dc7 /selection.c | |
| parent | input: relax requirements for overriding keypad application mode (diff) | |
| parent | selection: do not try to paste un-handled mime types (diff) | |
Merge branch 'clipboard-ignore-unhandled-mime-types'
Closes #230
Diffstat (limited to 'selection.c')
| -rw-r--r-- | selection.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/selection.c b/selection.c index 71f85b7e..cb57fd92 100644 --- a/selection.c +++ b/selection.c @@ -1370,7 +1370,9 @@ text_from_clipboard(struct seat *seat, struct terminal *term, void (*done)(void *user), void *user) { struct wl_clipboard *clipboard = &seat->clipboard; - if (clipboard->data_offer == NULL) { + if (clipboard->data_offer == NULL || + clipboard->mime_type == DATA_OFFER_MIME_UNSET) + { done(user); return; } @@ -1512,7 +1514,9 @@ text_from_primary( } struct wl_primary *primary = &seat->primary; - if (primary->data_offer == NULL){ + if (primary->data_offer == NULL || + primary->mime_type == DATA_OFFER_MIME_UNSET) + { done(user); return; } |
