Merge branch 'wip/nielsdg/fix-gir-warnings' into 'master'

Fix some GObject introspection annotations

See merge request GNOME/gtk!891

gdk/x11/gdksurface-x11.c

@@ -3317,6 +3317,14 @@ gdk_x11_surface_set_keep_below (GdkSurface *surface, gboolean setting)
 				 setting ? GDK_SURFACE_STATE_BELOW : 0);
 }
 
+/**
+ * gdk_x11_surface_get_group:
+ * @surface: The #GdkSurface
+ *
+ * Returns the group this surface belongs to.
+ *
+ * Returns: (transfer none): The group of this surface;
+ */
 GdkSurface *
 gdk_x11_surface_get_group (GdkSurface *surface)
 {

gsk/gskrendernode.c

@@ -350,7 +350,8 @@ gsk_render_node_write_to_file (GskRenderNode *node,
 /**
  * gsk_render_node_deserialize:
  * @bytes: the bytes containing the data
- * @error: (allow-none): location to store error or %NULL
+ * @error_func: (nullable) (scope call): Callback on parsing errors or %NULL
+ * @user_data: (closure error_func): user_data for @error_func
  *
  * Loads data previously created via gsk_render_node_serialize(). For a
  * discussion of the supported format, see that function.

gsk/gskrendernodeimpl.c

@@ -3556,6 +3556,14 @@ gsk_text_node_peek_color (GskRenderNode *node)
   return &self->color;
 }
 
+/**
+ * gsk_text_node_peek_font:
+ * @node: The #GskRenderNode
+ *
+ * Returns the font used by the text node.
+ *
+ * Returns: (transfer none): The used #PangoFont.
+ */
 PangoFont *
 gsk_text_node_peek_font (GskRenderNode *node)
 {

gtk/gtkmenubutton.c

@@ -1306,7 +1306,7 @@ gtk_menu_button_get_icon_name (GtkMenuButton *menu_button)
 /**
  * gtk_menu_button_set_label:
  * @menu_button: a #GtkMenuButton
- * @icon_name: the label
+ * @label: the label
  *
  * Sets the label to show inside the menu button.
  */

gtk/gtknative.c

@@ -74,7 +74,7 @@ gtk_native_default_init (GtkNativeInterface *iface)
  *
  * Returns the surface of this #GtkNative.
  *
- * Returns: the surface of @self
+ * Returns: (transfer none): the surface of @self
  */
 GdkSurface *
 gtk_native_get_surface (GtkNative *self)
@@ -90,7 +90,7 @@ gtk_native_get_surface (GtkNative *self)
  *
  * Returns the renderer that is used for this #GtkNative.
  *
- * Returns: the renderer for @self
+ * Returns: (transfer none): the renderer for @self
  */
 GskRenderer *
 gtk_native_get_renderer (GtkNative *self)

gtk/gtkpopover.c

@@ -1395,6 +1395,13 @@ size_changed (GtkWidget   *widget,
     gtk_popover_move_resize (popover);
 }
 
+/**
+ * gtk_popover_get_popovers:
+ *
+ * Returns the list of all existing #GtkPopover widgets.
+ *
+ * Returns: (transfer none): The list of existing popovers.
+ */
 GListModel *
 gtk_popover_get_popovers (void)
 {

gtk/gtkroot.h

@@ -49,7 +49,7 @@ struct _GtkRootInterface
 };
 
 GDK_AVAILABLE_IN_ALL
-GdkDisplay * gtk_root_get_display (GtkRoot *root);
+GdkDisplay * gtk_root_get_display (GtkRoot *self);
 
 GDK_AVAILABLE_IN_ALL
 void        gtk_root_set_focus (GtkRoot   *self,