label: Avoid creating new attribute list

Only create an attribute list for merging if we actually need to merge.

This bug was introduced in 5230cfe805
This commit is contained in:
Benjamin Otte
2014-02-04 23:34:06 +01:00
committed by Matthias Clasen
parent 5e39ee3ab4
commit 8e7dd6d8ff

View File

@@ -3422,7 +3422,7 @@ gtk_label_ensure_layout (GtkLabel *label)
pango_attr_list_insert (attrs, attribute);
}
}
else if (priv->markup_attrs || priv->attrs)
else if (priv->markup_attrs && priv->attrs)
attrs = pango_attr_list_new ();
else
attrs = NULL;