summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2012-11-29 22:02:16 -0500
committerMatthias Clasen <mclasen@redhat.com>2013-01-03 17:53:24 -0500
commit35079629a5392245f2dc9faf983fc0f80a87e4e9 (patch)
treeace09154c53cacb8dff3f64f4a16064e72c476b1
parenta568991866e201c8b4e1037fbebbd39f52a5847a (diff)
downloadgtk+-35079629a5392245f2dc9faf983fc0f80a87e4e9.tar.gz
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.
-rw-r--r--gtk/gtklabel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index bb3ca4f859..bf011b65f4 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;