diff options
| author | Timm Bäder <mail@baedert.org> | 2021-04-29 15:03:02 +0000 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2021-04-29 15:03:02 +0000 |
| commit | bf4290a330a433f7c32c5b702920ea5e47b4716d (patch) | |
| tree | 948993413e653c2c63511639ad9fb37ed2d55162 | |
| parent | e024a542b0e669cc9088edd88a098abc7e1fe5aa (diff) | |
| parent | 44aa328dc3bf94a6075ca36fc39748e7cae41c9e (diff) | |
| download | gtk+-bf4290a330a433f7c32c5b702920ea5e47b4716d.tar.gz | |
Merge branch 'wip/hadess/box-guards' into 'gtk-3-24'
box: Fix guards not working
See merge request GNOME/gtk!3485
| -rw-r--r-- | gtk/gtkbox.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index 3c4534a092..c372f9c714 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -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; |