diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2013-05-06 23:19:49 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-05-07 09:07:43 -0400 |
| commit | e314875d00739b9c55a065b96f8040f627edb8e3 (patch) | |
| tree | 2f11f67afaea905900ca2effcffc313e277775f4 /src/clipboard.c | |
| parent | 4912454ba48b36153011e25eaa840db2a18c7fb7 (diff) | |
| download | weston-e314875d00739b9c55a065b96f8040f627edb8e3.tar.gz | |
input: Merge wl_seat into weston_seat
Diffstat (limited to 'src/clipboard.c')
| -rw-r--r-- | src/clipboard.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/clipboard.c b/src/clipboard.c index 7f8d93b2..11edc712 100644 --- a/src/clipboard.c +++ b/src/clipboard.c @@ -209,15 +209,15 @@ clipboard_set_selection(struct wl_listener *listener, void *data) struct clipboard *clipboard = container_of(listener, struct clipboard, selection_listener); struct weston_seat *seat = data; - struct wl_data_source *source = seat->seat.selection_data_source; + struct wl_data_source *source = seat->selection_data_source; const char **mime_types; int p[2]; if (source == NULL) { if (clipboard->source) - wl_seat_set_selection(&seat->seat, - &clipboard->source->base, - clipboard->source->serial); + weston_seat_set_selection(seat, + &clipboard->source->base, + clipboard->source->serial); return; } else if (source->accept == clipboard_source_accept) { /* Callback for our data source. */ @@ -238,7 +238,7 @@ clipboard_set_selection(struct wl_listener *listener, void *data) clipboard->source = clipboard_source_create(clipboard, mime_types[0], - seat->seat.selection_serial, p[0]); + seat->selection_serial, p[0]); if (clipboard->source == NULL) return; } @@ -268,7 +268,7 @@ clipboard_create(struct weston_seat *seat) clipboard->selection_listener.notify = clipboard_set_selection; clipboard->destroy_listener.notify = clipboard_destroy; - wl_signal_add(&seat->seat.selection_signal, + wl_signal_add(&seat->selection_signal, &clipboard->selection_listener); wl_signal_add(&seat->destroy_signal, &clipboard->destroy_listener); |