[gimp/gtk3-port: 454/454] app: the last s/GdkDeviceManager/GdkSeat/



commit 6f28c5e192c575b8d84e4e3804b63411f121b4c2
Author: Michael Natterer <mitch gimp org>
Date:   Wed May 16 23:04:12 2018 +0200

    app: the last s/GdkDeviceManager/GdkSeat/

 app/display/gimpdisplayshell-grab.c |   12 ++++++------
 app/widgets/gimpuimanager.c         |   18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/app/display/gimpdisplayshell-grab.c b/app/display/gimpdisplayshell-grab.c
index 2126a78..e555004 100644
--- a/app/display/gimpdisplayshell-grab.c
+++ b/app/display/gimpdisplayshell-grab.c
@@ -42,10 +42,10 @@ get_associated_pointer (GdkDevice *device)
 
     case GDK_DEVICE_TYPE_FLOATING:
       {
-        GdkDisplay       *display = gdk_device_get_display (device);
-        GdkDeviceManager *manager = gdk_display_get_device_manager (display);
+        GdkDisplay *display = gdk_device_get_display (device);
+        GdkSeat    *seat    = gdk_display_get_default_seat (display);
 
-        return gdk_device_manager_get_client_pointer (manager);
+        return gdk_seat_get_pointer (seat);
       }
       break;
 
@@ -70,10 +70,10 @@ get_associated_keyboard (GdkDevice *device)
 
     case GDK_DEVICE_TYPE_FLOATING:
       {
-        GdkDisplay       *display = gdk_device_get_display (device);
-        GdkDeviceManager *manager = gdk_display_get_device_manager (display);
+        GdkDisplay *display = gdk_device_get_display (device);
+        GdkSeat    *seat    = gdk_display_get_default_seat (display);
 
-        device = gdk_device_manager_get_client_pointer (manager);
+        device = gdk_seat_get_pointer (seat);
       }
       break;
 
diff --git a/app/widgets/gimpuimanager.c b/app/widgets/gimpuimanager.c
index 1fca232..753e6a8 100644
--- a/app/widgets/gimpuimanager.c
+++ b/app/widgets/gimpuimanager.c
@@ -890,21 +890,21 @@ gimp_ui_manager_menu_position (GtkMenu  *menu,
                                gint     *y,
                                gpointer  data)
 {
-  GdkDeviceManager *device_manager;
-  GdkDevice        *device;
-  GdkScreen        *screen;
-  GtkRequisition    requisition;
-  GdkRectangle      workarea;
-  gint              pointer_x;
-  gint              pointer_y;
+  GdkSeat        *seat;
+  GdkDevice      *device;
+  GdkScreen      *screen;
+  GtkRequisition  requisition;
+  GdkRectangle    workarea;
+  gint            pointer_x;
+  gint            pointer_y;
 
   g_return_if_fail (GTK_IS_MENU (menu));
   g_return_if_fail (x != NULL);
   g_return_if_fail (y != NULL);
   g_return_if_fail (GTK_IS_WIDGET (data));
 
-  device_manager = gdk_display_get_device_manager (gtk_widget_get_display (data));
-  device = gdk_device_manager_get_client_pointer (device_manager);
+  seat = gdk_display_get_default_seat (gtk_widget_get_display (data));
+  device = gdk_seat_get_pointer (seat);
 
   gdk_device_get_position (device, &screen, &pointer_x, &pointer_y);
 


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