Merge branch 'ebassi/compute-size-annotation' into 'main'

Remove wrong annotation for GdkToplevel::compute-size

See merge request GNOME/gtk!5725

2 files changed, 18 insertions, 15 deletions

diff --git a/gdk/gdkdragsurface.c b/gdk/gdkdragsurface.c
index dcb6c28cca..e9c097ed2e 100644
--- a/gdk/gdkdragsurface.c
+++ b/gdk/gdkdragsurface.c
@@ -69,19 +69,21 @@ gdk_drag_surface_default_init (GdkDragSurfaceInterface *iface)
   /**
    * GdkDragSurface::compute-size:
    * @surface: a `GdkDragSurface`
-   * @size: (type Gdk.DragSurfaceSize) (out caller-allocates): a
-   * `GdkDragSurfaceSize`
+   * @size: (type Gdk.DragSurfaceSize): the size of the drag surface
    *
    * Emitted when the size for the surface needs to be computed, when it is
    * present.
    *
-   * It will normally be emitted during the native surface layout cycle when the
-   * surface size needs to be recomputed.
+   * This signal will normally be emitted during the native surface layout
+   * cycle when the surface size needs to be recomputed.
    *
-   * It is the responsibility of the drag surface user to handle this signal and
-   * compute the desired size of the surface, storing the computed size in the
-   * [struct@Gdk.DragSurfaceSize] object. Failing to do so will result in an
-   * arbitrary size being used as a result.
+   * It is the responsibility of the drag surface user to handle this signal
+   * and compute the desired size of the surface, storing the computed size
+   * in the [struct@Gdk.DragSurfaceSize] object that is passed to the signal
+   * handler, using [method@Gdk.DragSurfaceSize.set_size].
+   *
+   * Failing to set a size so will result in an arbitrary size being used as
+   * a result.
    *
    * Since: 4.12
    */
@@ -108,8 +110,8 @@ gdk_drag_surface_default_init (GdkDragSurfaceInterface *iface)
  */
 gboolean
 gdk_drag_surface_present (GdkDragSurface *drag_surface,
-                          int          width,
-                          int          height)
+                          int             width,
+                          int             height)
 {
   g_return_val_if_fail (GDK_IS_DRAG_SURFACE (drag_surface), FALSE);
   g_return_val_if_fail (width > 0, FALSE);
diff --git a/gdk/gdktoplevel.c b/gdk/gdktoplevel.c
index a7e4e42fcf..5a5c9e4d0f 100644
--- a/gdk/gdktoplevel.c
+++ b/gdk/gdktoplevel.c
@@ -261,15 +261,16 @@ gdk_toplevel_default_init (GdkToplevelInterface *iface)
   /**
    * GdkToplevel::compute-size:
    * @toplevel: a `GdkToplevel`
-   * @size: (type Gdk.ToplevelSize) (out caller-allocates): a `GdkToplevelSize`
+   * @size: (type Gdk.ToplevelSize): a `GdkToplevelSize`
    *
    * Emitted when the size for the surface needs to be computed, when
    * it is present.
    *
-   * It will normally be emitted during or after [method@Gdk.Toplevel.present],
-   * depending on the configuration received by the windowing system.
-   * It may also be emitted at any other point in time, in response
-   * to the windowing system spontaneously changing the configuration.
+   * This signal will normally be emitted during or after a call to
+   * [method@Gdk.Toplevel.present], depending on the configuration
+   * received by the windowing system. It may also be emitted at any
+   * other point in time, in response to the windowing system
+   * spontaneously changing the configuration of the toplevel surface.
    *
    * It is the responsibility of the toplevel user to handle this signal
    * and compute the desired size of the toplevel, given the information