Merge branch 'matthiasc/for-main' into 'main'

Deprecate gdk_display_put_event

See merge request GNOME/gtk!5409

4 files changed, 9 insertions, 3 deletions

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index c7a2e6203b..66216a4401 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -471,8 +471,8 @@ gdk_display_get_event (GdkDisplay *display)
  * Appends the given event onto the front of the event
  * queue for @display.
  *
- * This function is only useful in very special situations
- * and should not be used by applications.
+ * Deprecated: 4.10: This function is only useful in very
+ * special situations and should not be used by applications.
  **/
 void
 gdk_display_put_event (GdkDisplay *display,
diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index 0a07221dc1..3ab938ae11 100644
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -104,7 +104,7 @@ GDK_AVAILABLE_IN_ALL
 GdkMonitor * gdk_display_get_monitor_at_surface (GdkDisplay *display,
                                                 GdkSurface  *surface);
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_4_10
 void      gdk_display_put_event  (GdkDisplay     *display,
                                   GdkEvent       *event);
 
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 02ceb2f110..4f3d69fc83 100644
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -1450,7 +1450,9 @@ _gdk_device_manager_xi2_handle_focus (GdkSurface *surface,
       GdkEvent *event;
 
       event = gdk_focus_event_new (surface, device, focus_in);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
       gdk_display_put_event (gdk_surface_get_display (surface), event);
+G_GNUC_END_IGNORE_DEPRECATIONS
       gdk_event_unref (event);
     }
 }
diff --git a/gdk/x11/gdkeventsource.c b/gdk/x11/gdkeventsource.c
index 5a39a5b595..19fd9b9bfe 100644
--- a/gdk/x11/gdkeventsource.c
+++ b/gdk/x11/gdkeventsource.c
@@ -119,7 +119,9 @@ handle_focus_change (GdkEvent *event)
       focus_event = gdk_focus_event_new (gdk_event_get_surface (event),
                                          gdk_event_get_device (event),
                                          focus_in);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
       gdk_display_put_event (gdk_event_get_display (event), focus_event);
+G_GNUC_END_IGNORE_DEPRECATIONS
       gdk_event_unref (focus_event);
     }
 }
@@ -206,7 +208,9 @@ handle_touch_synthetic_crossing (GdkEvent *event)
 
   if (crossing)
     {
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
       gdk_display_put_event (gdk_seat_get_display (seat), crossing);
+G_GNUC_END_IGNORE_DEPRECATIONS
       gdk_event_unref (crossing);
     }
 }