From c308ea07559e7f86f5dd2073d4af8660afb37d72 Mon Sep 17 00:00:00 2001 From: Felix Riemann Date: Thu, 29 Dec 2016 15:10:46 +0100 Subject: EomScrollView: Switch from GtkDeviceManager to GdkSeat taken from: https://git.gnome.org/browse/eog/commit/?id=3de58ce --- src/eom-scroll-view.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/eom-scroll-view.c b/src/eom-scroll-view.c index 0a321d0..7099c6b 100644 --- a/src/eom-scroll-view.c +++ b/src/eom-scroll-view.c @@ -913,15 +913,24 @@ display_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer data) } if (do_zoom) { +#if GTK_CHECK_VERSION (3, 20, 0) + GdkSeat *seat; +#else GdkDeviceManager *device_manager; +#endif GdkDevice *device; gint x, y; - device_manager = gdk_display_get_device_manager (gtk_widget_get_display(widget)); +#if GTK_CHECK_VERSION (3, 20, 0) + seat = gdk_display_get_default_seat (gtk_widget_get_display (widget)); + device = gdk_seat_get_pointer (seat); +#else + device_manager = gdk_display_get_device_manager (gtk_widget_get_display (widget)); device = gdk_device_manager_get_client_pointer (device_manager); +#endif gdk_window_get_device_position (gtk_widget_get_window (widget), device, - &x, &y, NULL); + &x, &y, NULL); set_zoom (view, zoom, TRUE, x, y); } -- cgit v1.2.1