[gtk/wip/baedert/for-master: 4/5] label: Don't normalize booleans in internal setters



commit 764a1aa6b9f440911a1302f3eb0cbf6d1e74735c
Author: Timm Bäder <mail baedert org>
Date:   Sun Apr 12 10:04:30 2020 +0200

    label: Don't normalize booleans in internal setters
    
    We almost always pass a literal TRUE/FALSE to them.

 gtk/gtklabel.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 471a95ad97..65e65b3e74 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1803,7 +1803,6 @@ gtk_label_set_use_markup_internal (GtkLabel *label,
 {
   GtkLabelPrivate *priv = gtk_label_get_instance_private (label);
 
-  val = val != FALSE;
   if (priv->use_markup != val)
     {
       priv->use_markup = val;
@@ -1822,7 +1821,6 @@ gtk_label_set_use_underline_internal (GtkLabel *label,
 {
   GtkLabelPrivate *priv = gtk_label_get_instance_private (label);
 
-  val = val != FALSE;
   if (priv->use_underline != val)
     {
       priv->use_underline = val;
@@ -5111,7 +5109,7 @@ gtk_label_set_use_markup (GtkLabel *label,
 
   g_object_freeze_notify (G_OBJECT (label));
 
-  if (gtk_label_set_use_markup_internal (label, setting))
+  if (gtk_label_set_use_markup_internal (label, !!setting))
     gtk_label_recalculate (label);
 
   g_object_thaw_notify (G_OBJECT (label));
@@ -5153,7 +5151,7 @@ gtk_label_set_use_underline (GtkLabel *label,
 
   g_object_freeze_notify (G_OBJECT (label));
 
-  if (gtk_label_set_use_underline_internal (label, setting))
+  if (gtk_label_set_use_underline_internal (label, !!setting))
     gtk_label_recalculate (label);
 
   g_object_thaw_notify (G_OBJECT (label));


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]