[gtk+/gtk-3-6] GtkLabel: Fix a pointless expression



commit 35079629a5392245f2dc9faf983fc0f80a87e4e9
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Nov 29 22:02:16 2012 -0500

    GtkLabel: Fix a pointless expression
    
    Clearly, what was meant here was that we create a new attribute
    list if either of the input attribute lists are non-NULL.
    This was found by Coverity.

 gtk/gtklabel.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index bb3ca4f..bf011b6 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -3394,7 +3394,7 @@ gtk_label_ensure_layout (GtkLabel *label)
               pango_attr_list_insert (attrs, attribute);
             }
         }
-      else if (priv->markup_attrs && priv->markup_attrs)
+      else if (priv->markup_attrs || priv->attrs)
         attrs = pango_attr_list_new ();
       else
         attrs = NULL;



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