From: Timm Bäder <mail@baedert.org>
Date: Tue, 25 Apr 2017 13:43:10 +0000 (+0200)
Subject: label: Remove useless if statements
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~544
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c08f2cb7b5bfc26da726d2e23d77a71a5cfe80d7;p=gtk%2B3.0.git

label: Remove useless if statements

We never pass nullable pointers into get_size_for_allocation.
---

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index fbc8fdfe8e..af23f133ba 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -3645,11 +3645,8 @@ get_size_for_allocation (GtkLabel *label,
   if (minimum_baseline || natural_baseline)
     {
       baseline = pango_layout_get_baseline (layout) / PANGO_SCALE;
-      if (minimum_baseline)
-	*minimum_baseline = baseline;
-
-      if (natural_baseline)
-	*natural_baseline = baseline;
+      *minimum_baseline = baseline;
+      *natural_baseline = baseline;
     }
 
   g_object_unref (layout);