diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2016-04-01 16:39:30 +0800 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2016-09-09 10:09:46 +0800 |
| commit | e5a359a032f7ae572efeb3a7c2232a40de395d0d (patch) | |
| tree | 188e13d2fa0bbe1d61748598c58991fb75062ca2 /src/wayland/meta-wayland-pointer-gesture-pinch.c | |
| parent | d893adb290c3740ae57b761d9e57a2f4d79e6c7b (diff) | |
| download | mutter-e5a359a032f7ae572efeb3a7c2232a40de395d0d.tar.gz | |
wayland: Make seat devices GObjects
This will make it possible to add signals and other GObject features.
https://bugzilla.gnome.org/show_bug.cgi?id=771050
Diffstat (limited to 'src/wayland/meta-wayland-pointer-gesture-pinch.c')
| -rw-r--r-- | src/wayland/meta-wayland-pointer-gesture-pinch.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/wayland/meta-wayland-pointer-gesture-pinch.c b/src/wayland/meta-wayland-pointer-gesture-pinch.c index 80bc78f2a..3f91a1048 100644 --- a/src/wayland/meta-wayland-pointer-gesture-pinch.c +++ b/src/wayland/meta-wayland-pointer-gesture-pinch.c @@ -27,6 +27,7 @@ #include "meta-wayland-pointer-gesture-pinch.h" #include "meta-wayland-pointer.h" +#include "meta-wayland-seat.h" #include "meta-wayland-surface.h" #include "pointer-gestures-unstable-v1-server-protocol.h" @@ -39,7 +40,7 @@ handle_pinch_begin (MetaWaylandPointer *pointer, uint32_t serial; pointer_client = pointer->focus_client; - serial = wl_display_next_serial (pointer->display); + serial = wl_display_next_serial (pointer->seat->wl_display); wl_resource_for_each (resource, &pointer_client->pinch_gesture_resources) { @@ -84,7 +85,7 @@ handle_pinch_end (MetaWaylandPointer *pointer, uint32_t serial; pointer_client = pointer->focus_client; - serial = wl_display_next_serial (pointer->display); + serial = wl_display_next_serial (pointer->seat->wl_display); if (event->touchpad_pinch.phase == CLUTTER_TOUCHPAD_GESTURE_PHASE_CANCEL) cancelled = TRUE; |