From a0bfbc8ae1720fe9e82b0113df58d90c2931de73 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Tue, 4 Feb 2014 23:34:06 +0100
Subject: [PATCH] label: Avoid creating new attribute list

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

This bug was introduced in 5230cfe805b8f0046896c029612180fc9d4cc5df
---
 gtk/gtklabel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 3a6422cb95..912342767e 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -3361,7 +3361,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;