diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-12-02 13:16:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-02 13:16:50 -0500 |
| commit | 8887508fed89d59486a4abcff7a2071326ca8207 (patch) | |
| tree | 169bfbf09bf0d533da13f4965b896cb1a97dc86b /xwayland/selection/outgoing.c | |
| parent | 3f5f4cec88868818105bdc297f89d51fa378d99d (diff) | |
| parent | 9f0720c03abcc600b6156b52e367d7cafcf57644 (diff) | |
Merge pull request #1397 from emersion/refactor-primary-selection
gtk-primary-selection: refactor everything, untie from seat
Diffstat (limited to 'xwayland/selection/outgoing.c')
| -rw-r--r-- | xwayland/selection/outgoing.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xwayland/selection/outgoing.c b/xwayland/selection/outgoing.c index b658ab52..fd5021d5 100644 --- a/xwayland/selection/outgoing.c +++ b/xwayland/selection/outgoing.c @@ -4,11 +4,11 @@ #include <string.h> #include <unistd.h> #include <wlr/types/wlr_data_device.h> -#include <wlr/types/wlr_gtk_primary_selection.h> +#include <wlr/types/wlr_primary_selection.h> #include <wlr/util/log.h> #include <xcb/xfixes.h> -#include "xwayland/xwm.h" #include "xwayland/selection.h" +#include "xwayland/xwm.h" static void xwm_selection_send_notify(struct wlr_xwm *xwm, xcb_selection_request_event_t *req, bool success) { @@ -195,10 +195,10 @@ static void xwm_selection_source_send(struct wlr_xwm_selection *selection, return; } } else if (selection == &selection->xwm->primary_selection) { - struct wlr_gtk_primary_selection_source *source = + struct wlr_primary_selection_source *source = selection->xwm->seat->primary_selection_source; if (source != NULL) { - source->send(source, mime_type, fd); + wlr_primary_selection_source_send(source, mime_type, fd); return; } } else if (selection == &selection->xwm->dnd_selection) { @@ -231,7 +231,7 @@ static struct wl_array *xwm_selection_source_get_mime_types( return &source->mime_types; } } else if (selection == &selection->xwm->primary_selection) { - struct wlr_gtk_primary_selection_source *source = + struct wlr_primary_selection_source *source = selection->xwm->seat->primary_selection_source; if (source != NULL) { return &source->mime_types; |