From 598dedfe36495e68aeb5c29f7a16271f82c3cfc8 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Wed, 16 Dec 2015 19:08:52 +0100
Subject: [PATCH] broadway: Add a few ignore deprecations statements around
 GdkDeviceManager

There's places where we still need to deal with floating devices, which are
unseen by seats. Ignore deprecations and keep using GdkDeviceManager until
we can forget about floating devices.
---
 gdk/broadway/gdkdevice-broadway.c  | 4 ++++
 gdk/broadway/gdkdisplay-broadway.c | 2 ++
 gdk/broadway/gdkeventsource.c      | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/gdk/broadway/gdkdevice-broadway.c b/gdk/broadway/gdkdevice-broadway.c
index cfd9f96fb8..aa9172d453 100644
--- a/gdk/broadway/gdkdevice-broadway.c
+++ b/gdk/broadway/gdkdevice-broadway.c
@@ -219,12 +219,14 @@ _gdk_broadway_window_grab_check_unmap (GdkWindow *window,
   GdkDeviceManager *device_manager;
   GList *devices, *d;
 
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   device_manager = gdk_display_get_device_manager (display);
 
   /* Get all devices */
   devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
   devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_SLAVE));
   devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_FLOATING));
+  G_GNUC_END_IGNORE_DEPRECATIONS;
 
   /* End all grabs on the newly hidden window */
   for (d = devices; d; d = d->next)
@@ -242,10 +244,12 @@ _gdk_broadway_window_grab_check_destroy (GdkWindow *window)
   GdkDeviceGrabInfo *grab;
   GList *devices, *d;
 
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   device_manager = gdk_display_get_device_manager (display);
 
   /* Get all devices */
   devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
+  G_GNUC_END_IGNORE_DEPRECATIONS;
 
   for (d = devices; d; d = d->next)
     {
diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c
index 307728f760..f3522208cb 100644
--- a/gdk/broadway/gdkdisplay-broadway.c
+++ b/gdk/broadway/gdkdisplay-broadway.c
@@ -75,6 +75,7 @@ gdk_broadway_display_init_input (GdkDisplay *display)
   GList *list, *l;
 
   broadway_display = GDK_BROADWAY_DISPLAY (display);
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   device_manager = gdk_display_get_device_manager (display);
 
   /* For backwards compatibility, just add
@@ -110,6 +111,7 @@ gdk_broadway_display_init_input (GdkDisplay *display)
       display->core_pointer = device;
       break;
     }
+  G_GNUC_END_IGNORE_DEPRECATIONS;
 
   /* Add the core pointer to the devices list */
   broadway_display->input_devices = g_list_prepend (broadway_display->input_devices,
diff --git a/gdk/broadway/gdkeventsource.c b/gdk/broadway/gdkeventsource.c
index 358abd04ea..14b70ee3b3 100644
--- a/gdk/broadway/gdkeventsource.c
+++ b/gdk/broadway/gdkeventsource.c
@@ -117,7 +117,9 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
   g_assert (display != NULL);
 
   display_broadway = GDK_BROADWAY_DISPLAY (display);
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
   device_manager = GDK_BROADWAY_DEVICE_MANAGER (gdk_display_get_device_manager (display));
+  G_GNUC_END_IGNORE_DEPRECATIONS;
 
   switch (message->base.type) {
   case BROADWAY_EVENT_ENTER: