Merge branch 'wip/ricotz/annotations' into 'master'

Really fix annotation for GtkDropTarget.get_gtypes()

See merge request GNOME/gtk!1510
This commit is contained in:
Benjamin Otte 2020-03-09 20:47:29 +00:00
commit 8742d42f32
2 changed files with 7 additions and 5 deletions

View File

@ -454,15 +454,16 @@ gdk_content_formats_contain_mime_type (const GdkContentFormats *formats,
/**
* gdk_content_formats_get_gtypes:
* @formats: a #GdkContentFormats
* @n_gtypes: (out) (allow-none): optional pointer to take the
* @n_gtypes: (out) (optional): optional pointer to take the
* number of #GTypes contained in the return value
*
* Gets the #GTypes included in @formats. Note that @formats may not
* contain any #GTypes, in particular when they are empty. In that
* case %NULL will be returned.
*
* Returns: (transfer none) (nullable): %G_TYPE_INVALID-terminated array of
* types included in @formats or %NULL if none.
* Returns: (transfer none) (nullable) (array length=n_gtypes):
* %G_TYPE_INVALID-terminated array of types included in @formats or
* %NULL if none.
**/
const GType *
gdk_content_formats_get_gtypes (const GdkContentFormats *formats,

View File

@ -870,8 +870,9 @@ gtk_drop_target_set_gtypes (GtkDropTarget *self,
* Gets the list of supported #GTypes for @self. If no type have been set,
* %NULL will be returned.
*
* Returns: (transfer none) (nullable): %G_TYPE_INVALID-terminated array of
* types included in @formats or %NULL if none.
* Returns: (transfer none) (nullable) (array length=n_types):
* %G_TYPE_INVALID-terminated array of types included in @formats or
* %NULL if none.
**/
const GType *
gtk_drop_target_get_gtypes (GtkDropTarget *self,