diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-07-25 09:38:22 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-07-25 09:42:35 -0400 |
| commit | 407a778bc5b9639ae15eb298a3978549b9c116c3 (patch) | |
| tree | 47e8f80028f0aa12407a69f4aea5dc4b4ed60dc7 /gdk/wayland | |
| parent | 4eb2a74fb83d5287e645c91d30899dbc9525b603 (diff) | |
| download | gtk+-407a778bc5b9639ae15eb298a3978549b9c116c3.tar.gz | |
wayland-device: Handle v2 of seat
Diffstat (limited to 'gdk/wayland')
| -rw-r--r-- | gdk/wayland/gdkdevice-wayland.c | 9 | ||||
| -rw-r--r-- | gdk/wayland/gdkdisplay-wayland.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c index aa879b36e3..72395d1d45 100644 --- a/gdk/wayland/gdkdevice-wayland.c +++ b/gdk/wayland/gdkdevice-wayland.c @@ -1583,8 +1583,17 @@ seat_handle_capabilities (void *data, } } +static void +seat_handle_name (void *data, + struct wl_seat *seat, + const char *name) +{ + /* We don't care about the name. */ +} + static const struct wl_seat_listener seat_listener = { seat_handle_capabilities, + seat_handle_name, }; static void diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index ee8e903f38..2f13b0cc5b 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -171,7 +171,7 @@ gdk_registry_handle_global(void *data, struct wl_registry *registry, uint32_t id wl_registry_bind(display_wayland->wl_registry, id, &wl_output_interface, MIN (version, 2)); _gdk_wayland_screen_add_output(display_wayland->screen, id, output, MIN (version, 2)); } else if (strcmp(interface, "wl_seat") == 0) { - seat = wl_registry_bind(display_wayland->wl_registry, id, &wl_seat_interface, 1); + seat = wl_registry_bind(display_wayland->wl_registry, id, &wl_seat_interface, 2); _gdk_wayland_device_manager_add_seat (gdk_display->device_manager, id, seat); } else if (strcmp(interface, "wl_data_device_manager") == 0) { display_wayland->data_device_manager = |