summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimm Bäder <mail@baedert.org>2016-05-03 16:07:50 -0400
committerMatthias Clasen <mclasen@redhat.com>2016-05-05 15:04:02 -0400
commit200ed52e92e47f3da080194341a50fcf4a357d89 (patch)
treef93e6455d118296f6bf085304e1246e14ec508cc
parent304e2d57115d5a90348737446217ac092640815e (diff)
downloadgtk+-200ed52e92e47f3da080194341a50fcf4a357d89.tar.gz
label: minimum/natural size parameters are not nullable
Stop comparing them to NULL.
-rw-r--r--gtk/gtklabel.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 278349cc38..6cb5331a24 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -3641,11 +3641,8 @@ get_size_for_allocation (GtkLabel *label,
pango_layout_get_pixel_size (layout, NULL, &text_height);
- if (minimum_size)
- *minimum_size = text_height;
-
- if (natural_size)
- *natural_size = text_height;
+ *minimum_size = text_height;
+ *natural_size = text_height;
if (minimum_baseline || natural_baseline)
{