From: Timm Bäder <mail@baedert.org>
Date: Sat, 3 Jun 2017 12:38:56 +0000 (+0200)
Subject: popover: Remove useless if case
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~35
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0bbf351f6418973e977fb167dfcb898dae5b2c37;p=gtk%2B3.0.git

popover: Remove useless if case

rect is not nullable, so stop checking if it is NULL and instead add a
g_return_val_if_fail guard.

Origin: 3.24.39, commit:ad07e9043f36319ae2d733a8d5d0ef89ee9a7586

Gbp-Pq: Name popover-Remove-useless-if-case.patch
---

diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index 45680d0b4b..82ad2fc291 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -2327,16 +2327,14 @@ gtk_popover_get_pointing_to (GtkPopover   *popover,
   GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover);
 
   g_return_val_if_fail (GTK_IS_POPOVER (popover), FALSE);
+  g_return_val_if_fail (rect != NULL, FALSE);
 
-  if (rect)
+  if (priv->has_pointing_to)
+    *rect = priv->pointing_to;
+  else if (priv->widget)
     {
-      if (priv->has_pointing_to)
-        *rect = priv->pointing_to;
-      else if (priv->widget)
-        {
-          gtk_widget_get_allocation (priv->widget, rect);
-          rect->x = rect->y = 0;
-        }
+      gtk_widget_get_allocation (priv->widget, rect);
+      rect->x = rect->y = 0;
     }
 
   return priv->has_pointing_to;