[gtk+/gtk-3-10] label: Avoid creating new attribute list

[Matthias Clasen <matthiasc src gnome org>]

commit 8e7dd6d8ff1ee0e2aab5a7f8efdf52b4e1a8bc41
Author: Benjamin Otte <otte redhat com>
Date:   Tue Feb 4 23:34:06 2014 +0100

    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 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 31a1b47..2333f63 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -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;