From df766d544381202506fdfa9d609d3cf78bf5e36b Mon Sep 17 00:00:00 2001 From: Lloyd Konneker Date: Fri, 5 Mar 2021 19:10:10 +0000 Subject: [PATCH] Fix annotations allowing null "constraint" and "data" args, #6526 --- libgimp/gimpimagecombobox.c | 6 +++--- libgimp/gimpitemcombobox.c | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libgimp/gimpimagecombobox.c b/libgimp/gimpimagecombobox.c index 65ebcbd497..2a91b391b8 100644 --- a/libgimp/gimpimagecombobox.c +++ b/libgimp/gimpimagecombobox.c @@ -128,9 +128,9 @@ gimp_image_combo_box_finalize (GObject *object) /** * gimp_image_combo_box_new: - * @constraint: a #GimpImageConstraintFunc or %NULL - * @data: a pointer that is passed to @constraint - * @data_destroy: Destroy function for @data. + * @constraint: (nullable): a #GimpImageConstraintFunc or %NULL + * @data: (closure): a pointer that is passed to @constraint + * @data_destroy: (destroy): Destroy function for @data. * * Creates a new #GimpIntComboBox filled with all currently opened * images. If a @constraint function is specified, it is called for diff --git a/libgimp/gimpitemcombobox.c b/libgimp/gimpitemcombobox.c index bde7abff0f..23b52887ce 100644 --- a/libgimp/gimpitemcombobox.c +++ b/libgimp/gimpitemcombobox.c @@ -167,9 +167,9 @@ gimp_drawable_combo_box_init (GimpDrawableComboBox *combo_box) /** * gimp_drawable_combo_box_new: - * @constraint: (nullable): a #GimpItemConstraintFunc or %NULL - * @data: (closure): a pointer that is passed to @constraint - * @data_destroy: Destroy function for @data + * @constraint: (nullable): a #GimpItemConstraintFunc or %NULL + * @data: (closure): a pointer that is passed to @constraint + * @data_destroy: (destroy): Destroy function for @data * * Creates a new #GimpIntComboBox filled with all currently opened * drawables. If a @constraint function is specified, it is called for @@ -223,9 +223,9 @@ gimp_channel_combo_box_init (GimpChannelComboBox *combo_box) /** * gimp_channel_combo_box_new: - * @constraint: a #GimpItemConstraintFunc or %NULL - * @data: a pointer that is passed to @constraint - * @data_destroy: Destroy function for @data + * @constraint: (nullable): a #GimpItemConstraintFunc or %NULL + * @data: (closure): a pointer that is passed to @constraint + * @data_destroy: (destroy): Destroy function for @data * * Creates a new #GimpIntComboBox filled with all currently opened * channels. See gimp_drawable_combo_box_new() for more information. @@ -272,9 +272,9 @@ gimp_layer_combo_box_init (GimpLayerComboBox *combo_box) /** * gimp_layer_combo_box_new: - * @constraint: a #GimpItemConstraintFunc or %NULL - * @data: a pointer that is passed to @constraint - * @data_destroy: Destroy function for @data + * @constraint: (nullable): a #GimpItemConstraintFunc or %NULL + * @data: (closure): a pointer that is passed to @constraint + * @data_destroy: (destroy): Destroy function for @data * * Creates a new #GimpIntComboBox filled with all currently opened * layers. See gimp_drawable_combo_box_new() for more information. @@ -322,9 +322,9 @@ gimp_vectors_combo_box_init (GimpVectorsComboBox *combo_box) /** * gimp_vectors_combo_box_new: - * @constraint: a #GimpItemConstraintFunc or %NULL - * @data: a pointer that is passed to @constraint - * @data_destroy: Destroy function for @data + * @constraint: (nullable): a #GimpItemConstraintFunc or %NULL + * @data: (closure): a pointer that is passed to @constraint + * @data_destroy: (destroy): Destroy function for @data * * Creates a new #GimpIntComboBox filled with all currently opened * vectors objects. If a @constraint function is specified, it is called for