Reset effective_attrs when necessary

This fixes both bug 607217 and bug 607269.

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index aebd8c61d2ff2072ef27d7db5626181beb8d7b0e..854318ce5d6317d1e85956aade94886822f8788b 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1911,24 +1911,22 @@ gtk_label_recalculate (GtkLabel *label)
   guint keyval = label->mnemonic_keyval;
 
   if (label->use_markup)
-    {
-      gtk_label_set_markup_internal (label, label->label, label->use_underline);
-      gtk_label_compose_effective_attrs (label);
-    }
+    gtk_label_set_markup_internal (label, label->label, label->use_underline);
   else
     {
       if (label->use_underline)
-       {
-         gtk_label_set_uline_text_internal (label, label->label);
-         gtk_label_compose_effective_attrs (label);
-       }
+       gtk_label_set_uline_text_internal (label, label->label);
       else
-       {
-         gtk_label_set_text_internal (label, g_strdup (label->label));
-         gtk_label_compose_effective_attrs (label);
-       }
+        {
+          if (label->effective_attrs)
+            pango_attr_list_unref (label->effective_attrs);
+          label->effective_attrs = NULL;
+          gtk_label_set_text_internal (label, g_strdup (label->label));
+        }
     }
 
+  gtk_label_compose_effective_attrs (label);
+
   if (!label->use_underline)
     label->mnemonic_keyval = GDK_VoidSymbol;
 
@@ -1995,7 +1993,7 @@ gtk_label_set_attributes (GtkLabel         *label,
 
   gtk_label_recalculate (label);
 
-  gtk_label_clear_layout (label);  
+  gtk_label_clear_layout (label);
   gtk_widget_queue_resize (GTK_WIDGET (label));
 }