From 21f4b1cb35d95e4ed783ef2ba963875291b4eaff Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Mon, 16 Jul 2012 15:36:40 +0100 Subject: [PATCH] wayland: Use the correct union member for axis events Otherwise we end up overriding other members of the struct (in this case the device pointer) and generate an error. --- gdk/wayland/gdkdevice-wayland.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c index f1698b3996..4054dc2cf6 100644 --- a/gdk/wayland/gdkdevice-wayland.c +++ b/gdk/wayland/gdkdevice-wayland.c @@ -1139,7 +1139,7 @@ pointer_handle_axis (void *data, event->scroll.direction = GDK_SCROLL_SMOOTH; event->scroll.delta_x = delta_x; event->scroll.delta_y = delta_y; - event->button.state = device->modifiers; + event->scroll.state = device->modifiers; gdk_event_set_screen (event, display->screen); GDK_NOTE (EVENTS,