summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErnestas Kulik <ernestas.kulik@gmail.com>2016-04-17 20:20:02 +0300
committerCarlos Soriano <csoriano@gnome.org>2016-04-22 15:53:01 +0200
commit202a66fb46c0d5c84ad03381d43ac95984bc559a (patch)
tree967c96e7d9833f7274e7ed160d594fe45b032010
parentfe0a16a34c761f186a656aff3149c92063da47d7 (diff)
downloadnautilus-202a66fb46c0d5c84ad03381d43ac95984bc559a.tar.gz
canvas-container: use GdkSeat operations
Some GdkDisplay operations have been deprecated in GDK 3.20. This commit replaces the deprecated code with new GdkSeat operations. https://bugzilla.gnome.org/show_bug.cgi?id=762235
-rw-r--r--libnautilus-private/nautilus-canvas-container.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/libnautilus-private/nautilus-canvas-container.c b/libnautilus-private/nautilus-canvas-container.c
index 6b292c4f8..e7c1eea84 100644
--- a/libnautilus-private/nautilus-canvas-container.c
+++ b/libnautilus-private/nautilus-canvas-container.c
@@ -2251,6 +2251,8 @@ rubberband_timeout_callback (gpointer data)
double world_x, world_y;
int x_scroll, y_scroll;
int adj_x, adj_y;
+ GdkDisplay *display;
+ GdkSeat *seat;
gboolean adj_changed;
GtkAllocation allocation;
@@ -2277,10 +2279,11 @@ rubberband_timeout_callback (gpointer data)
adj_changed = TRUE;
}
+ display = gtk_widget_get_display (widget);
+ seat = gdk_display_get_default_seat (display);
+
gdk_window_get_device_position (gtk_widget_get_window (widget),
- gdk_device_manager_get_client_pointer (
- gdk_display_get_device_manager (
- gtk_widget_get_display (widget))),
+ gdk_seat_get_pointer (seat),
&x, &y, NULL);
if (x < RUBBERBAND_SCROLL_THRESHOLD) {