Merge branch 'wip/hadess/box-guards' into 'gtk-3-24'

box: Fix guards not working

See merge request GNOME/gtk!3485
This commit is contained in:
Timm Bäder 2021-04-29 15:03:02 +00:00
commit bf4290a330

View File

@ -1526,14 +1526,17 @@ gtk_box_pack (GtkBox *box,
guint padding,
GtkPackType pack_type)
{
GtkContainer *container = GTK_CONTAINER (box);
GtkBoxPrivate *private = box->priv;
GtkContainer *container;
GtkBoxPrivate *private;
GtkBoxChild *child_info;
g_return_val_if_fail (GTK_IS_BOX (box), NULL);
g_return_val_if_fail (GTK_IS_WIDGET (child), NULL);
g_return_val_if_fail (_gtk_widget_get_parent (child) == NULL, NULL);
container = GTK_CONTAINER (box);
private = box->priv;
child_info = g_new (GtkBoxChild, 1);
child_info->widget = child;
child_info->padding = padding;