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
parent 4439453b75
commit a0bfbc8ae1

View File

@ -3361,7 +3361,7 @@ gtk_label_ensure_layout (GtkLabel *label)
pango_attr_list_insert (attrs, attribute); 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 (); attrs = pango_attr_list_new ();
else else
attrs = NULL; attrs = NULL;