Merge branch 'ebassi/for-master' into 'master'

Introspection fixes

Closes #3281

See merge request GNOME/gtk!2852

5 files changed, 12 insertions, 11 deletions

diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index 16508c27a3..58d75199f8 100644
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -66,7 +66,7 @@ typedef enum
  * GdkTimeCoord:
  * @time: The timestamp for this event.
  * @flags: Flags indicating what axes are present
- * @axes: axis values
+ * @axes: (array fixed-size=12): axis values
  *
  * A #GdkTimeCoord stores a single event in a motion history.
  */
diff --git a/gdk/gdkpopuplayout.c b/gdk/gdkpopuplayout.c
index e22017045d..0542bec811 100644
--- a/gdk/gdkpopuplayout.c
+++ b/gdk/gdkpopuplayout.c
@@ -300,10 +300,10 @@ gdk_popup_layout_set_offset (GdkPopupLayout *layout,
 /**
  * gdk_popup_layout_get_offset:
  * @layout: a #GdkPopupLayout
- * @dx: a pointer to where to store the delta x coordinate
- * @dy: a pointer to where to store the delta y coordinate
+ * @dx: (out): return location for the delta X coordinate
+ * @dy: (out): return location for the delta Y coordinate
  *
- * Get the delta the anchor rectangle is offset with
+ * Retrieves the offset for the anchor rectangle.
  */
 void
 gdk_popup_layout_get_offset (GdkPopupLayout *layout,
diff --git a/gsk/gskrendernodeimpl.c b/gsk/gskrendernodeimpl.c
index d2b0543741..b104372baf 100644
--- a/gsk/gskrendernodeimpl.c
+++ b/gsk/gskrendernodeimpl.c
@@ -940,8 +940,9 @@ gsk_border_node_peek_outline (GskRenderNode *node)
  *
  * Retrieves the stroke widths of the border.
  *
- * Returns: (transfer none): an array of 4 floats for the top,
- *     right, bottom and left stroke width of the border
+ * Returns: (transfer none) (array fixed-size=4): an array of 4 floats
+ *   for the top, right, bottom and left stroke width of the border,
+ *   respectively
  */
 const float *
 gsk_border_node_peek_widths (GskRenderNode *node)
diff --git a/gtk/gtkshortcutaction.c b/gtk/gtkshortcutaction.c
index 431a1202ce..6a04372439 100644
--- a/gtk/gtkshortcutaction.c
+++ b/gtk/gtkshortcutaction.c
@@ -319,7 +319,7 @@ gtk_nothing_action_init (GtkNothingAction *self)
  * Gets the nothing action. This is an action that does nothing and where
  * activating it always fails.
  *
- * Returns: (transfer none): The nothing action
+ * Returns: (transfer none) (type GtkNothingAction): The nothing action
  */
 GtkShortcutAction *
 gtk_nothing_action_get (void)
@@ -409,7 +409,7 @@ gtk_callback_action_init (GtkCallbackAction *self)
  * Create a custom action that calls the given @callback when
  * activated.
  *
- * Returns: (transfer full): A new shortcut action
+ * Returns: (transfer full) (type GtkCallbackAction): A new shortcut action
  */
 GtkShortcutAction *
 gtk_callback_action_new (GtkShortcutFunc callback,
@@ -491,7 +491,7 @@ gtk_activate_action_init (GtkActivateAction *self)
  * Gets the activate action. This is an action that calls gtk_widget_activate()
  * on the given widget upon activation.
  *
- * Returns: (transfer none): The activate action
+ * Returns: (transfer none) (type GtkActivateAction): The activate action
  */
 GtkShortcutAction *
 gtk_activate_action_get (void)
@@ -566,7 +566,7 @@ gtk_mnemonic_action_init (GtkMnemonicAction *self)
  * Gets the mnemonic action. This is an action that calls
  * gtk_widget_mnemonic_activate() on the given widget upon activation.
  *
- * Returns: (transfer none): The mnemonic action
+ * Returns: (transfer none) (type GtkMnemonicAction): The mnemonic action
  */
 GtkShortcutAction *
 gtk_mnemonic_action_get (void)
diff --git a/gtk/gtktreeexpander.c b/gtk/gtktreeexpander.c
index 9b50e02039..5e1de3cf42 100644
--- a/gtk/gtktreeexpander.c
+++ b/gtk/gtktreeexpander.c
@@ -740,7 +740,7 @@ gtk_tree_expander_set_child (GtkTreeExpander *self,
  * This call is essentially equivalent to calling
  * `gtk_tree_list_row_get_item (gtk_tree_expander_get_list_row (@self))`.
  *
- * Returns: (nullable) (transfer none): The item of the row
+ * Returns: (nullable) (transfer none) (type GObject): The item of the row
  **/
 gpointer
 gtk_tree_expander_get_item (GtkTreeExpander *self)