From 69b1b4d95b13220c5e231a156a21946a1205f7a1 Mon Sep 17 00:00:00 2001 From: Hugo Parente Lima Date: Tue, 31 May 2022 20:49:58 -0300 Subject: [PATCH] Fix introspection annotation for gtk_stack_get_page Annotate gtk_stack_get_page return value as nullable. Fixes #4958 --- gtk/gtkstack.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c index facf7ca3eb..1d245e7db1 100644 --- a/gtk/gtkstack.c +++ b/gtk/gtkstack.c @@ -1638,9 +1638,9 @@ gtk_stack_remove (GtkStack *stack, * @stack: a `GtkStack` * @child: a child of @stack * - * Returns the `GtkStackPage` object for @child. + * Returns the `GtkStackPage` object for @child or NULL if @child isn't a `GtkStack` child. * - * Returns: (transfer none): the `GtkStackPage` for @child + * Returns: (transfer none) (nullable): the `GtkStackPage` for @child */ GtkStackPage * gtk_stack_get_page (GtkStack *stack, @@ -2583,7 +2583,7 @@ gtk_stack_measure (GtkWidget *widget, int min_for_size; gtk_widget_measure (child, OPPOSITE_ORIENTATION (orientation), -1, &min_for_size, NULL, NULL, NULL); - + gtk_widget_measure (child, orientation, MAX (min_for_size, for_size), &child_min, &child_nat, NULL, NULL); } else