[gtk+/xi2] GtkColorSelection: Use GTK+ device grabs.



commit 7880ee3aa8e82b548e10d908b40bf32f05ae3de8
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Mar 9 18:30:53 2010 +0100

    GtkColorSelection: Use GTK+ device grabs.

 gtk/gtkcolorsel.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 2c18c98..c0cd4e1 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -1693,7 +1693,7 @@ shutdown_eyedropper (GtkWidget *widget)
     {
       gdk_device_ungrab (priv->keyboard_device, priv->grab_time);
       gdk_device_ungrab (priv->pointer_device, priv->grab_time);
-      gtk_grab_remove (priv->dropper_grab_widget);
+      gtk_device_grab_remove (priv->dropper_grab_widget, priv->pointer_device);
 
       priv->has_grab = FALSE;
       priv->keyboard_device = NULL;
@@ -1913,7 +1913,10 @@ get_screen_color (GtkWidget *button)
       return;
     }
 
-  gtk_grab_add (priv->dropper_grab_widget);
+  gtk_device_grab_add (priv->dropper_grab_widget,
+                       pointer_device,
+                       TRUE);
+
   priv->grab_time = time;
   priv->has_grab = TRUE;
   priv->keyboard_device = keyb_device;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]