diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c index 624d2688d8..ddeafa4182 100644 --- a/gdk/x11/gdkdevice-xi2.c +++ b/gdk/x11/gdkdevice-xi2.c @@ -425,7 +425,9 @@ gdk_x11_device_xi2_grab (GdkDevice *device, gint status; display = gdk_device_get_display (device); + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; device_manager_xi2 = GDK_X11_DEVICE_MANAGER_XI2 (gdk_display_get_device_manager (display)); + G_GNUC_END_IGNORE_DEPRECATIONS; /* FIXME: confine_to is actually unused */ @@ -676,7 +678,9 @@ gdk_x11_device_xi2_select_window_events (GdkDevice *device, XIEventMask evmask; display = gdk_device_get_display (device); + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; device_manager_xi2 = GDK_X11_DEVICE_MANAGER_XI2 (gdk_display_get_device_manager (display)); + G_GNUC_END_IGNORE_DEPRECATIONS; evmask.deviceid = device_xi2->device_id; evmask.mask = _gdk_x11_device_xi2_translate_event_mask (device_manager_xi2, diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index eff9f931ed..8ab621969f 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -1330,9 +1330,11 @@ gdk_event_init (GdkDisplay *display) gdk_x11_event_source_add_translator ((GdkEventSource *) display_x11->event_source, GDK_EVENT_TRANSLATOR (display)); + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; device_manager = gdk_display_get_device_manager (display); gdk_x11_event_source_add_translator ((GdkEventSource *) display_x11->event_source, GDK_EVENT_TRANSLATOR (device_manager)); + G_GNUC_END_IGNORE_DEPRECATIONS; } static void @@ -1344,12 +1346,15 @@ gdk_x11_display_init_input (GdkDisplay *display) GList *list, *l; display_x11 = GDK_X11_DISPLAY (display); + + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; device_manager = gdk_display_get_device_manager (display); /* For backwards compatibility, just add * floating devices that are not keyboards. */ list = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_FLOATING); + G_GNUC_END_IGNORE_DEPRECATIONS; for (l = list; l; l = l->next) { diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c index 9ab7c243b2..6e445155e0 100644 --- a/gdk/x11/gdkmain-x11.c +++ b/gdk/x11/gdkmain-x11.c @@ -155,12 +155,14 @@ _gdk_x11_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) @@ -184,12 +186,14 @@ _gdk_x11_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); 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; for (d = devices; d; d = d->next) {