The big versioning cleanup

Remove all the old 2.x and 3.x version annotations.
GTK+ 4 is a new start, and from the perspective of a
GTK+ 4 developer all these APIs have been around since
the beginning.

20 files changed, 24 insertions, 126 deletions

diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index 6fcad7d574..6f94511cde 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -276,8 +276,6 @@ gdk_x11_cursor_create_for_name (GdkDisplay  *display,
  * by the application (GTK+ applications can learn about
  * cursor theme changes by listening for change notification
  * for the corresponding #GtkSetting).
- *
- * Since: 2.8
  */
 void
 gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
diff --git a/gdk/x11/gdkdevicemanager-x11.c b/gdk/x11/gdkdevicemanager-x11.c
index d5ef24bb1f..7d5add3622 100644
--- a/gdk/x11/gdkdevicemanager-x11.c
+++ b/gdk/x11/gdkdevicemanager-x11.c
@@ -88,8 +88,6 @@ _gdk_x11_device_manager_new (GdkDisplay *display)
  *
  * Returns: (transfer none) (allow-none) (type GdkX11DeviceCore): The #GdkDevice wrapping the device ID,
  *          or %NULL if the given ID doesn’t currently represent a device.
- *
- * Since: 3.2
  **/
 GdkDevice *
 gdk_x11_device_manager_lookup (GdkX11DeviceManagerCore *device_manager,
@@ -133,8 +131,6 @@ gdk_x11_device_manager_lookup (GdkX11DeviceManagerCore *device_manager,
  * > those managed via XInput 1.x), will return 0.
  *
  * Returns: the XInput2 device ID.
- *
- * Since: 3.2
  **/
 gint
 gdk_x11_device_get_id (GdkDevice *device)
@@ -170,8 +166,6 @@ gdk_x11_device_get_id (GdkDevice *device)
  * applications that do mixed GDK/Xlib calls could want to disable
  * multidevice support if such Xlib code deals with input devices in
  * any way and doesn’t observe the presence of XInput 2.
- *
- * Since: 3.0
  */
 void
 gdk_disable_multidevice (void)
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 716e20f774..75dde8f5ff 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1692,8 +1692,6 @@ gdk_x11_display_open (const gchar *display_name)
  *
  * The X11 backend uses the program class to set the class name part
  * of the `WM_CLASS` property on toplevel windows; see the ICCCM.
- *
- * Since: 3.94
  */
 void
 gdk_x11_display_set_program_class (GdkDisplay *display,
@@ -1903,8 +1901,6 @@ gdk_x11_display_get_default_group (GdkDisplay *display)
  * To ungrab the display again, use gdk_x11_display_ungrab(). 
  *
  * gdk_x11_display_grab()/gdk_x11_display_ungrab() calls can be nested.
- *
- * Since: 2.2
  **/
 void
 gdk_x11_display_grab (GdkDisplay *display)
@@ -1926,8 +1922,6 @@ gdk_x11_display_grab (GdkDisplay *display)
  * 
  * Ungrab @display after it has been grabbed with 
  * gdk_x11_display_grab(). 
- *
- * Since: 2.2
  **/
 void
 gdk_x11_display_ungrab (GdkDisplay *display)
@@ -2032,8 +2026,6 @@ gdk_x11_display_finalize (GObject *object)
  * Find the #GdkDisplay corresponding to @xdisplay, if any exists.
  * 
  * Returns: (transfer none) (type GdkX11Display): the #GdkDisplay, if found, otherwise %NULL.
- *
- * Since: 2.2
  **/
 GdkDisplay *
 gdk_x11_lookup_xdisplay (Display *xdisplay)
@@ -2114,8 +2106,6 @@ _gdk_x11_display_screen_for_xrootwin (GdkDisplay *display,
  * Returns the X display of a #GdkDisplay.
  *
  * Returns: (transfer none): an X display
- *
- * Since: 2.2
  */
 Display *
 gdk_x11_display_get_xdisplay (GdkDisplay *display)
@@ -2132,8 +2122,6 @@ gdk_x11_display_get_xdisplay (GdkDisplay *display)
  * Returns the X Screen used by #GdkDisplay.
  *
  * Returns: (transfer none): an X Screen
- *
- * Since: 3.94
  */
 Screen *
 gdk_x11_display_get_xscreen (GdkDisplay *display)
@@ -2150,8 +2138,6 @@ gdk_x11_display_get_xscreen (GdkDisplay *display)
  * Returns the root X window used by #GdkDisplay.
  *
  * Returns: an X Window
- *
- * Since: 3.94
  */
 Window
 gdk_x11_display_get_xrootwindow (GdkDisplay *display)
@@ -2289,8 +2275,6 @@ broadcast_xmessage (GdkDisplay *display,
  * not normally need to call it directly. See the
  * [Startup Notification Protocol specification](http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt)
  * for definitions of the message types and keys that can be used.
- *
- * Since: 2.12
  **/
 void
 gdk_x11_display_broadcast_startup_message (GdkDisplay *display,
@@ -2398,8 +2382,6 @@ gdk_x11_display_request_selection_notification (GdkDisplay *display,
  * movements. See gdk_x11_window_set_user_time().
  *
  * Returns: the timestamp of the last user interaction 
- *
- * Since: 2.8
  */
 guint32
 gdk_x11_display_get_user_time (GdkDisplay *display)
@@ -2427,8 +2409,6 @@ gdk_x11_display_supports_input_shapes (GdkDisplay *display)
  * Gets the startup notification ID for a display.
  * 
  * Returns: the startup notification ID for @display
- *
- * Since: 2.12
  */
 const gchar *
 gdk_x11_display_get_startup_notification_id (GdkDisplay *display)
@@ -2455,8 +2435,6 @@ gdk_x11_display_get_startup_notification_id (GdkDisplay *display)
  * The startup ID is also what is used to signal that the startup is
  * complete (for example, when opening a window or when calling
  * gdk_notify_startup_complete()).
- *
- * Since: 3.0
  **/
 void
 gdk_x11_display_set_startup_notification_id (GdkDisplay  *display,
@@ -2528,8 +2506,6 @@ gdk_x11_display_set_startup_notification_id (GdkDisplay  *display,
  *
  * This function should only be needed in unusual circumstances, e.g.
  * when filtering XInput extension events on the root window.
- *
- * Since: 2.4
  **/
 void
 gdk_x11_register_standard_event_type (GdkDisplay *display,
@@ -2679,8 +2655,6 @@ delete_outdated_error_traps (GdkX11Display *display_x11)
  * with this function.
  *
  * See also gdk_error_trap_push() to push a trap on all displays.
- *
- * Since: 3.0
  */
 void
 gdk_x11_display_error_trap_push (GdkDisplay *display)
@@ -2785,8 +2759,6 @@ gdk_x11_display_error_trap_pop_internal (GdkDisplay *display,
  *
  * Once the scale is set by this call it will not change in response
  * to later user configuration changes.
- *
- * Since: 3.10
  */
 void
 gdk_x11_display_set_window_scale (GdkDisplay *display,
@@ -2833,8 +2805,6 @@ gdk_x11_display_set_window_scale (GdkDisplay *display,
  * See gdk_error_trap_pop() for the all-displays-at-once
  * equivalent.
  *
- * Since: 3.0
- *
  * Returns: X error code or 0 on success
  */
 gint
@@ -2856,8 +2826,6 @@ gdk_x11_display_error_trap_pop (GdkDisplay *display)
  *
  * See gdk_error_trap_pop_ignored() for the all-displays-at-once
  * equivalent.
- *
- * Since: 3.0
  */
 void
 gdk_x11_display_error_trap_pop_ignored (GdkDisplay *display)
@@ -2878,8 +2846,6 @@ gdk_x11_display_error_trap_pop_ignored (GdkDisplay *display)
  *
  * See the X Session Management Library documentation for more information on
  * session management and the Inter-Client Communication Conventions Manual
- *
- * Since: 2.24
  */
 void
 gdk_x11_set_sm_client_id (const gchar *sm_client_id)
diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
index 59249462f2..fdd9571b92 100644
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -1297,8 +1297,6 @@ gdk_x11_display_make_gl_context_current (GdkDisplay   *display,
  * Retrieves the version of the GLX implementation.
  *
  * Returns: %TRUE if GLX is available
- *
- * Since: 3.16
  */
 gboolean
 gdk_x11_display_get_glx_version (GdkDisplay *display,
diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index 7889b99d1d..be54e66e18 100644
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -1393,8 +1393,6 @@ gdk_x11_keymap_translate_keyboard_state (GdkKeymap       *keymap,
  * directly includes an is_modifier field.
  *
  * Returns: the index of the active keyboard group for the event
- *
- * Since: 3.6
  */
 gint
 gdk_x11_keymap_get_group_for_state (GdkKeymap *keymap,
@@ -1484,8 +1482,6 @@ gdk_x11_keymap_add_virtual_modifiers (GdkKeymap       *keymap,
  * an is_modifier field.
  *
  * Returns: %TRUE if the hardware keycode is a modifier key
- *
- * Since: 3.6
  */
 gboolean
 gdk_x11_keymap_key_is_modifier (GdkKeymap *keymap,
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index be26586a92..5579e6a4b4 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -75,8 +75,6 @@ lookup_cached_xatom (GdkDisplay *display,
  * is converted to %None.
  *
  * Returns: the X atom corresponding to @atom, or %None
- *
- * Since: 2.2
  **/
 Atom
 gdk_x11_atom_to_xatom_for_display (GdkDisplay *display,
@@ -153,8 +151,6 @@ _gdk_x11_precache_atoms (GdkDisplay          *display,
  * #GdkAtom.
  * 
  * Returns: (transfer none): the corresponding #GdkAtom.
- *
- * Since: 2.2
  **/
 GdkAtom
 gdk_x11_xatom_to_atom_for_display (GdkDisplay *display,
@@ -211,8 +207,6 @@ gdk_x11_xatom_to_atom_for_display (GdkDisplay *display,
  * faster than XInternAtom(), which is a round trip to the server each time.
  * 
  * Returns: a X atom for a #GdkDisplay
- *
- * Since: 2.2
  **/
 Atom
 gdk_x11_get_xatom_by_name_for_display (GdkDisplay  *display,
@@ -254,8 +248,6 @@ _gdk_x11_get_xatom_for_display_printf (GdkDisplay    *display,
  *
  * Returns: name of the X atom; this string is owned by GDK,
  *   so it shouldn’t be modifed or freed. 
- *
- * Since: 2.2
  **/
 const gchar *
 gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index c12898f133..2d973d425b 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -127,8 +127,6 @@ gdk_x11_screen_finalize (GObject *object)
  * extension, 0 is returned.
  *
  * Returns: the XID of the monitor
- *
- * Since: 2.14
  */
 XID
 gdk_x11_screen_get_monitor_output (GdkX11Screen *x11_screen,
@@ -261,8 +259,6 @@ out:
  * Returns the screen of a #GdkX11Screen.
  *
  * Returns: (transfer none): an Xlib Screen*
- *
- * Since: 2.2
  */
 Screen *
 gdk_x11_screen_get_xscreen (GdkX11Screen *screen)
@@ -278,8 +274,6 @@ gdk_x11_screen_get_xscreen (GdkX11Screen *screen)
  *
  * Returns: the position of @screen among the screens
  *     of its display
- *
- * Since: 2.2
  */
 int
 gdk_x11_screen_get_screen_number (GdkX11Screen *screen)
@@ -1078,8 +1072,6 @@ fetch_net_wm_check_window (GdkX11Screen *x11_screen)
  * a window manager change.
  *
  * Returns: %TRUE if the window manager supports @property
- *
- * Since: 2.2
  **/
 gboolean
 gdk_x11_screen_supports_net_wm_hint (GdkX11Screen *x11_screen,
@@ -1157,8 +1149,6 @@ gdk_x11_screen_supports_net_wm_hint (GdkX11Screen *x11_screen,
  * Returns: the name of the window manager screen @screen, or
  * "unknown" if the window manager is unknown. The string is owned by GDK
  * and should not be freed.
- *
- * Since: 2.2
  **/
 const char*
 gdk_x11_screen_get_window_manager_name (GdkX11Screen *x11_screen)
@@ -1278,8 +1268,6 @@ get_netwm_cardinal_property (GdkX11Screen *x11_screen,
  * [Extended Window Manager Hints](http://www.freedesktop.org/Standards/wm-spec) specification.
  *
  * Returns: the number of workspaces, or 0 if workspaces are not supported
- *
- * Since: 3.10
  */
 guint32
 gdk_x11_screen_get_number_of_desktops (GdkX11Screen *screen)
@@ -1297,8 +1285,6 @@ gdk_x11_screen_get_number_of_desktops (GdkX11Screen *screen)
  * [Extended Window Manager Hints](http://www.freedesktop.org/Standards/wm-spec) specification.
  *
  * Returns: the current workspace, or 0 if workspaces are not supported
- *
- * Since: 3.10
  */
 guint32
 gdk_x11_screen_get_current_desktop (GdkX11Screen *screen)
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index aa3babc251..7f34dfce84 100644
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -53,8 +53,6 @@
  *
  * Returns: the number of strings stored in list, or 0,
  *     if the conversion failed
- *
- * Since: 2.24
  */
 gint
 gdk_x11_display_text_property_to_text_list (GdkDisplay   *display,
@@ -102,8 +100,6 @@ gdk_x11_display_text_property_to_text_list (GdkDisplay   *display,
  *
  * Frees the array of strings created by
  * gdk_x11_display_text_property_to_text_list().
- *
- * Since: 2.24
  */
 void
 gdk_x11_free_text_list (gchar **list)
@@ -289,8 +285,6 @@ _gdk_x11_display_text_property_to_utf8_list (GdkDisplay    *display,
  * locale into a form suitable for storing in a window property.
  *
  * Returns: 0 upon success, non-zero upon failure
- *
- * Since: 2.24
  */
 gint
 gdk_x11_display_string_to_compound_text (GdkDisplay  *display,
@@ -409,8 +403,6 @@ _gdk_x11_display_utf8_to_string_target (GdkDisplay  *display,
  *
  * Returns: %TRUE if the conversion succeeded,
  *     otherwise %FALSE
- *
- * Since: 2.24
  */
 gboolean
 gdk_x11_display_utf8_to_compound_text (GdkDisplay  *display,
@@ -480,8 +472,6 @@ gdk_x11_display_utf8_to_compound_text (GdkDisplay  *display,
  *   gdk_x11_display_string_to_compound_text().
  *
  * Frees the data returned from gdk_x11_display_string_to_compound_text().
- *
- * Since: 2.24
  */
 void
 gdk_x11_free_compound_text (guchar *ctext)
diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index be7718f1f4..c43c853def 100644
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -290,8 +290,6 @@ _gdk_x11_screen_init_visuals (GdkX11Screen *x11_screen,
  *
  * Returns: (transfer none) (type GdkX11Visual): the #GdkVisual (owned by the screen
  *   object), or %NULL if the visual ID wasn’t found.
- *
- * Since: 2.2
  */
 GdkX11Visual *
 gdk_x11_screen_lookup_visual (GdkX11Screen *x11_screen,
diff --git a/gdk/x11/gdkvulkancontext-x11.h b/gdk/x11/gdkvulkancontext-x11.h
index f275c00f9f..c2364a8d3a 100644
--- a/gdk/x11/gdkvulkancontext-x11.h
+++ b/gdk/x11/gdkvulkancontext-x11.h
@@ -51,7 +51,7 @@ struct _GdkX11VulkanContextClass
   GdkVulkanContextClass parent_class;
 };
 
-GDK_AVAILABLE_IN_3_90
+GDK_AVAILABLE_IN_ALL
 GType gdk_x11_vulkan_context_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 83f8dea6f2..c509cb2073 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1050,8 +1050,6 @@ x_event_mask_to_gdk_event_mask (long mask)
  * Returns: (transfer full): a #GdkWindow wrapper for the native
  *   window, or %NULL if the window has been destroyed. The wrapper
  *   will be newly created, if one doesn’t exist already.
- *
- * Since: 2.24
  */
 GdkWindow *
 gdk_x11_window_foreign_new_for_display (GdkDisplay *display,
@@ -1678,8 +1676,6 @@ gdk_window_x11_lower (GdkWindow *window)
  * window manager that supports multiple workspaces, as described
  * in the [Extended Window Manager Hints](http://www.freedesktop.org/Standards/wm-spec) specification.
  * Will not do anything if the window is already on all workspaces.
- * 
- * Since: 2.8
  */
 void
 gdk_x11_window_move_to_current_desktop (GdkWindow *window)
@@ -1746,8 +1742,6 @@ get_netwm_cardinal_property (GdkWindow   *window,
  * Gets the number of the workspace @window is on.
  *
  * Returns: the current workspace of @window
- *
- * Since: 3.10
  */
 guint32
 gdk_x11_window_get_desktop (GdkWindow *window)
@@ -1765,8 +1759,6 @@ gdk_x11_window_get_desktop (GdkWindow *window)
  * Moves the window to the given workspace when running unde a
  * window manager that supports multiple workspaces, as described
  * in the [Extended Window Manager Hints](http://www.freedesktop.org/Standards/wm-spec) specification.
- *
- * Since: 3.10
  */
 void
 gdk_x11_window_move_to_desktop (GdkWindow *window,
@@ -2888,8 +2880,6 @@ gdk_x11_window_set_focus_on_map (GdkWindow *window,
  * Note that this property is automatically updated by GDK, so this
  * function should only be used by applications which handle input
  * events bypassing GDK.
- *
- * Since: 2.6
  **/
 void
 gdk_x11_window_set_user_time (GdkWindow *window,
@@ -2945,8 +2935,6 @@ gdk_x11_window_set_user_time (GdkWindow *window,
  * This function modifies or removes an arbitrary X11 window
  * property of type UTF8_STRING.  If the given @window is
  * not a toplevel window, it is ignored.
- *
- * Since: 3.4
  */
 void
 gdk_x11_window_set_utf8_property  (GdkWindow *window,
@@ -3012,8 +3000,6 @@ gdk_x11_window_set_shadow_width (GdkWindow *window,
  * This is the same as gdk_window_set_shadow_width() but it only works
  * on GdkX11Window.
  *
- * Since: 3.10
- *
  * Deprecated: 3.12: Use gdk_window_set_shadow_width() instead.
  */
 void
@@ -3040,8 +3026,6 @@ gdk_x11_window_set_frame_extents (GdkWindow *window,
  * Note that this property is automatically updated by GTK+, so this
  * function should only be used by applications which do not use GTK+
  * to create toplevel windows.
- *
- * Since: 3.2
  */
 void
 gdk_x11_window_set_theme_variant (GdkWindow  *window,
@@ -4800,8 +4784,6 @@ gdk_x11_window_get_scale_factor (GdkWindow *window)
  * the window is not directly managed by the window manager, then frame
  * synchronziation may need to be disabled. This is the case for a window
  * embedded via the XEMBED protocol.
- *
- * Since: 3.8
  */
 void
 gdk_x11_window_set_frame_sync_enabled (GdkWindow *window,
diff --git a/gdk/x11/gdkx11device.h b/gdk/x11/gdkx11device.h
index f42613bfbe..56cb9edb30 100644
--- a/gdk/x11/gdkx11device.h
+++ b/gdk/x11/gdkx11device.h
@@ -26,7 +26,7 @@
 
 G_BEGIN_DECLS
 
-GDK_AVAILABLE_IN_3_2
+GDK_AVAILABLE_IN_ALL
 gint  gdk_x11_device_get_id  (GdkDevice *device);
 
 G_END_DECLS
diff --git a/gdk/x11/gdkx11devicemanager.h b/gdk/x11/gdkx11devicemanager.h
index 5b24e63837..51833a954a 100644
--- a/gdk/x11/gdkx11devicemanager.h
+++ b/gdk/x11/gdkx11devicemanager.h
@@ -30,7 +30,7 @@
 
 G_BEGIN_DECLS
 
-GDK_AVAILABLE_IN_3_2
+GDK_AVAILABLE_IN_ALL
 GdkDevice * gdk_x11_device_manager_lookup (GdkX11DeviceManagerCore *device_manager,
                                            gint                     device_id);
 GDK_AVAILABLE_IN_ALL
diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h
index d82051979a..85f54995b1 100644
--- a/gdk/x11/gdkx11display.h
+++ b/gdk/x11/gdkx11display.h
@@ -54,16 +54,16 @@ typedef struct _GdkX11DisplayClass GdkX11DisplayClass;
 GDK_AVAILABLE_IN_ALL
 GType      gdk_x11_display_get_type            (void);
 
-GDK_AVAILABLE_IN_3_94
+GDK_AVAILABLE_IN_ALL
 GdkDisplay *  gdk_x11_display_open        (const char  *display_name);
 
 GDK_AVAILABLE_IN_ALL
 Display *     gdk_x11_display_get_xdisplay     (GdkDisplay  *display);
-GDK_AVAILABLE_IN_3_94
+GDK_AVAILABLE_IN_ALL
 Screen *      gdk_x11_display_get_xscreen      (GdkDisplay  *display);
-GDK_AVAILABLE_IN_3_94
+GDK_AVAILABLE_IN_ALL
 Window        gdk_x11_display_get_xrootwindow  (GdkDisplay  *display);
-GDK_AVAILABLE_IN_3_94
+GDK_AVAILABLE_IN_ALL
 Cursor        gdk_x11_display_get_xcursor      (GdkDisplay  *display,
                                                 GdkCursor   *cursor);
 
@@ -85,7 +85,7 @@ const gchar * gdk_x11_display_get_startup_notification_id         (GdkDisplay *d
 GDK_AVAILABLE_IN_ALL
 void          gdk_x11_display_set_startup_notification_id         (GdkDisplay  *display,
                                                                    const gchar *startup_id);
-GDK_AVAILABLE_IN_3_94
+GDK_AVAILABLE_IN_ALL
 void          gdk_x11_display_set_program_class                   (GdkDisplay  *display,
                                                                    const char  *program_class);
 
@@ -102,7 +102,7 @@ void gdk_x11_display_broadcast_startup_message (GdkDisplay *display,
 GDK_AVAILABLE_IN_ALL
 GdkDisplay   *gdk_x11_lookup_xdisplay (Display *xdisplay);
 
-GDK_AVAILABLE_IN_3_94
+GDK_AVAILABLE_IN_ALL
 GdkX11Screen *gdk_x11_display_get_screen (GdkDisplay *display);
 
 GDK_AVAILABLE_IN_ALL
@@ -110,7 +110,7 @@ void        gdk_x11_display_grab              (GdkDisplay *display);
 GDK_AVAILABLE_IN_ALL
 void        gdk_x11_display_ungrab            (GdkDisplay *display);
 
-GDK_AVAILABLE_IN_3_10
+GDK_AVAILABLE_IN_ALL
 void        gdk_x11_display_set_window_scale (GdkDisplay *display,
                                               gint scale);
 
diff --git a/gdk/x11/gdkx11glcontext.h b/gdk/x11/gdkx11glcontext.h
index 6d1d21a626..0701869133 100644
--- a/gdk/x11/gdkx11glcontext.h
+++ b/gdk/x11/gdkx11glcontext.h
@@ -36,10 +36,10 @@ G_BEGIN_DECLS
 typedef struct _GdkX11GLContext		GdkX11GLContext;
 typedef struct _GdkX11GLContextClass	GdkX11GLContextClass;
 
-GDK_AVAILABLE_IN_3_16
+GDK_AVAILABLE_IN_ALL
 GType gdk_x11_gl_context_get_type (void) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_3_16
+GDK_AVAILABLE_IN_ALL
 gboolean        gdk_x11_display_get_glx_version (GdkDisplay *display,
                                                  gint       *major,
                                                  gint       *minor);
diff --git a/gdk/x11/gdkx11keys.h b/gdk/x11/gdkx11keys.h
index b69f040b53..a011bb483d 100644
--- a/gdk/x11/gdkx11keys.h
+++ b/gdk/x11/gdkx11keys.h
@@ -43,11 +43,11 @@ typedef struct _GdkX11KeymapClass GdkX11KeymapClass;
 GDK_AVAILABLE_IN_ALL
 GType gdk_x11_keymap_get_type (void);
 
-GDK_AVAILABLE_IN_3_6
+GDK_AVAILABLE_IN_ALL
 gint gdk_x11_keymap_get_group_for_state (GdkKeymap *keymap,
                                          guint      state);
 
-GDK_AVAILABLE_IN_3_6
+GDK_AVAILABLE_IN_ALL
 gboolean gdk_x11_keymap_key_is_modifier (GdkKeymap *keymap,
                                          guint      keycode);
 G_END_DECLS
diff --git a/gdk/x11/gdkx11monitor.h b/gdk/x11/gdkx11monitor.h
index 98717e81a0..d1363437e6 100644
--- a/gdk/x11/gdkx11monitor.h
+++ b/gdk/x11/gdkx11monitor.h
@@ -37,10 +37,10 @@ G_BEGIN_DECLS
 typedef struct _GdkX11Monitor      GdkX11Monitor;
 typedef struct _GdkX11MonitorClass GdkX11MonitorClass;
 
-GDK_AVAILABLE_IN_3_22
+GDK_AVAILABLE_IN_ALL
 GType             gdk_x11_monitor_get_type            (void) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_3_22
+GDK_AVAILABLE_IN_ALL
 XID               gdk_x11_monitor_get_output          (GdkMonitor *monitor);
 
 G_END_DECLS
diff --git a/gdk/x11/gdkx11screen.h b/gdk/x11/gdkx11screen.h
index 867f9ab90b..791bb4b6b4 100644
--- a/gdk/x11/gdkx11screen.h
+++ b/gdk/x11/gdkx11screen.h
@@ -65,9 +65,9 @@ GDK_AVAILABLE_IN_ALL
 XID      gdk_x11_screen_get_monitor_output   (GdkX11Screen *screen,
                                               gint          monitor_num);
 
-GDK_AVAILABLE_IN_3_10
+GDK_AVAILABLE_IN_ALL
 guint32  gdk_x11_screen_get_number_of_desktops (GdkX11Screen *screen);
-GDK_AVAILABLE_IN_3_10
+GDK_AVAILABLE_IN_ALL
 guint32  gdk_x11_screen_get_current_desktop    (GdkX11Screen *screen);
 
 G_END_DECLS
diff --git a/gdk/x11/gdkx11window.h b/gdk/x11/gdkx11window.h
index 8257941a52..46b141b5ea 100644
--- a/gdk/x11/gdkx11window.h
+++ b/gdk/x11/gdkx11window.h
@@ -58,14 +58,14 @@ Window   gdk_x11_window_get_xid           (GdkWindow   *window);
 GDK_AVAILABLE_IN_ALL
 void     gdk_x11_window_set_user_time     (GdkWindow   *window,
                                            guint32      timestamp);
-GDK_AVAILABLE_IN_3_4
+GDK_AVAILABLE_IN_ALL
 void     gdk_x11_window_set_utf8_property    (GdkWindow *window,
 					      const gchar *name,
 					      const gchar *value);
-GDK_AVAILABLE_IN_3_2
+GDK_AVAILABLE_IN_ALL
 void     gdk_x11_window_set_theme_variant (GdkWindow   *window,
                                            const char  *variant);
-GDK_DEPRECATED_IN_3_12_FOR(gdk_window_set_shadow_width)
+GDK_DEPRECATED_FOR(gdk_window_set_shadow_width)
 void     gdk_x11_window_set_frame_extents (GdkWindow *window,
                                            int        left,
                                            int        right,
@@ -74,13 +74,13 @@ void     gdk_x11_window_set_frame_extents (GdkWindow *window,
 GDK_AVAILABLE_IN_ALL
 void     gdk_x11_window_move_to_current_desktop (GdkWindow   *window);
 
-GDK_AVAILABLE_IN_3_10
+GDK_AVAILABLE_IN_ALL
 guint32  gdk_x11_window_get_desktop             (GdkWindow   *window);
-GDK_AVAILABLE_IN_3_10
+GDK_AVAILABLE_IN_ALL
 void     gdk_x11_window_move_to_desktop         (GdkWindow   *window,
                                                  guint32      desktop);
 
-GDK_AVAILABLE_IN_3_8
+GDK_AVAILABLE_IN_ALL
 void     gdk_x11_window_set_frame_sync_enabled (GdkWindow *window,
                                                 gboolean   frame_sync_enabled);
 
diff --git a/gdk/x11/gdkxid.c b/gdk/x11/gdkxid.c
index 1a8171ed45..d74b367b41 100644
--- a/gdk/x11/gdkxid.c
+++ b/gdk/x11/gdkxid.c
@@ -97,8 +97,6 @@ _gdk_x11_display_remove_window (GdkDisplay *display,
  *
  * Returns: (transfer none) (type GdkX11Window): the #GdkWindow wrapper for the native
  *    window, or %NULL if there is none.
- *
- * Since: 2.24
  */
 GdkWindow *
 gdk_x11_window_lookup_for_display (GdkDisplay *display,