[Xfce4-commits] [xfce/xfce4-appfinder] 11/13: Fix gdk_display_get_device_manager deprecation

noreply at xfce.org noreply at xfce.org
Mon Jul 17 03:22:18 CEST 2017


This is an automated email from the git hooks/post-receive script.

a   n   d   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-appfinder.

commit aeeb73aabe89badfdcb3398c30de7b569aec8b54
Author: Andre Miranda <andreldm at xfce.org>
Date:   Sun Jul 16 14:31:39 2017 -0300

    Fix gdk_display_get_device_manager deprecation
    
    Use GdkSeat
---
 src/appfinder-window.c | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/appfinder-window.c b/src/appfinder-window.c
index 2c24a4e..1010354 100644
--- a/src/appfinder-window.c
+++ b/src/appfinder-window.c
@@ -1258,32 +1258,14 @@ xfce_appfinder_window_entry_activate (GtkEditable         *entry,
 static gboolean
 xfce_appfinder_window_pointer_is_grabbed (GtkWidget *widget)
 {
-#if GTK_CHECK_VERSION (3, 0, 0)
-  GdkDeviceManager *device_manager;
-  GList            *devices, *li;
+  GdkSeat          *seat;
+  GdkDevice        *pointer;
   GdkDisplay       *display;
-  gboolean          is_grabbed = FALSE;
 
   display = gtk_widget_get_display (widget);
-  device_manager = gdk_display_get_device_manager (display);
-  devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
-
-  for (li = devices; li != NULL; li = li->next)
-    {
-      if (gdk_device_get_source (li->data) == GDK_SOURCE_MOUSE
-          && gdk_display_device_is_grabbed (display, li->data))
-        {
-          is_grabbed = TRUE;
-          break;
-        }
-    }
-
-  g_list_free (devices);
-
-  return is_grabbed;
-#else
-  return gdk_pointer_is_grabbed ();
-#endif
+  seat = gdk_display_get_default_seat (display);
+  pointer = gdk_seat_get_pointer (seat);
+  return gdk_display_device_is_grabbed (display, pointer);
 }
 
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list