summaryrefslogtreecommitdiff
path: root/gtk/gtklabel.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2012-11-29 22:02:16 -0500
committerMatthias Clasen <mclasen@redhat.com>2012-11-29 23:10:34 -0500
commit5230cfe805b8f0046896c029612180fc9d4cc5df (patch)
treea67833e20f8a75e893539e2f304da9d7e656fe66 /gtk/gtklabel.c
parent256f16852528d5760786192649e62fa3dcaa013f (diff)
downloadgtk+-5230cfe805b8f0046896c029612180fc9d4cc5df.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.
Diffstat (limited to 'gtk/gtklabel.c')
-rw-r--r--gtk/gtklabel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 92f55b6c14..5f0591dfa3 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -3384,7 +3384,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;