From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 27 Jun 2015 12:10:20 +0000 (+0200)
Subject: Replace two instances of gdk_pointer_grab with gdk_device_grab
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=736604e671564634e89a8acb73c1532c1736fee3;hp=85504dbd347c77decad21e7d730b60a4fac52e07;p=pspp

Replace two instances of gdk_pointer_grab with gdk_device_grab
---

diff --git a/src/ui/gui/pspp-sheet-view.c b/src/ui/gui/pspp-sheet-view.c
index 641b77bd57..9de116ce9e 100644
--- a/src/ui/gui/pspp-sheet-view.c
+++ b/src/ui/gui/pspp-sheet-view.c
@@ -2564,11 +2564,14 @@ pspp_sheet_view_button_press (GtkWidget      *widget,
 	{
 	  gpointer drag_data;
 
-	  if (gdk_pointer_grab (column->window, FALSE,
-				GDK_POINTER_MOTION_HINT_MASK |
-				GDK_BUTTON1_MOTION_MASK |
-				GDK_BUTTON_RELEASE_MASK,
-				NULL, NULL, event->time))
+	  if (GDK_GRAB_SUCCESS != gdk_device_grab (event->device,
+						   column->window,
+						   GDK_OWNERSHIP_NONE,
+						   FALSE,
+						   GDK_POINTER_MOTION_HINT_MASK |
+						   GDK_BUTTON1_MOTION_MASK |
+						   GDK_BUTTON_RELEASE_MASK,
+						   NULL, event->time))
 	    return FALSE;
 
 	  gtk_grab_add (widget);
@@ -2684,8 +2687,8 @@ pspp_sheet_view_button_release_column_resize (GtkWidget      *widget,
 
   PSPP_SHEET_VIEW_UNSET_FLAG (tree_view, PSPP_SHEET_VIEW_IN_COLUMN_RESIZE);
   gtk_grab_remove (widget);
-  gdk_display_pointer_ungrab (gdk_window_get_display (event->window),
-			      event->time);
+  gdk_device_ungrab (event->device, event->time);
+
   return TRUE;
 }