From c2d4f05ce0b85c175e2177dc19142a10660200e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Tue, 16 Jan 2018 18:47:52 +0100 Subject: [PATCH] box: Remove some unneeded checks We only call this function from the measure implementation and we should never get NULL pointers there. --- gtk/gtkbox.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index eafc62a3a3..21f3881583 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -1223,15 +1223,11 @@ gtk_box_compute_size_for_opposing_orientation (GtkBox *box, } } - if (minimum_baseline) - *minimum_baseline = computed_minimum_baseline; - if (natural_baseline) - *natural_baseline = computed_natural_baseline; - - if (minimum_size) *minimum_size = computed_minimum; - if (natural_size) *natural_size = MAX (computed_natural, computed_natural_below + computed_natural_above); + + *minimum_baseline = computed_minimum_baseline; + *natural_baseline = computed_natural_baseline; } static void