Allow gtk_label_set_attributes() take NULL. See bug #128517.

2003-12-04  Mark McLoughlin  <mark@skynet.ie>

        * gtk/gtklabel.c: (gtk_label_set_attributes_internal): Allow
        gtk_label_set_attributes() take NULL. See bug #128517.
This commit is contained in:
Mark McLoughlin 2003-12-04 18:17:23 +00:00 committed by Mark McLoughlin
parent fe8219eb23
commit 7dac6a2b01
6 changed files with 27 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2003-12-04 Mark McLoughlin <mark@skynet.ie>
* gtk/gtklabel.c: (gtk_label_set_attributes_internal): Allow
gtk_label_set_attributes() take NULL. See bug #128517.
2003-12-03 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserentry.c (struct _GtkFileChooserEntry): Removed

View File

@ -1,3 +1,8 @@
2003-12-04 Mark McLoughlin <mark@skynet.ie>
* gtk/gtklabel.c: (gtk_label_set_attributes_internal): Allow
gtk_label_set_attributes() take NULL. See bug #128517.
2003-12-03 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserentry.c (struct _GtkFileChooserEntry): Removed

View File

@ -1,3 +1,8 @@
2003-12-04 Mark McLoughlin <mark@skynet.ie>
* gtk/gtklabel.c: (gtk_label_set_attributes_internal): Allow
gtk_label_set_attributes() take NULL. See bug #128517.
2003-12-03 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserentry.c (struct _GtkFileChooserEntry): Removed

View File

@ -1,3 +1,8 @@
2003-12-04 Mark McLoughlin <mark@skynet.ie>
* gtk/gtklabel.c: (gtk_label_set_attributes_internal): Allow
gtk_label_set_attributes() take NULL. See bug #128517.
2003-12-03 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserentry.c (struct _GtkFileChooserEntry): Removed

View File

@ -1,3 +1,8 @@
2003-12-04 Mark McLoughlin <mark@skynet.ie>
* gtk/gtklabel.c: (gtk_label_set_attributes_internal): Allow
gtk_label_set_attributes() take NULL. See bug #128517.
2003-12-03 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserentry.c (struct _GtkFileChooserEntry): Removed

View File

@ -874,7 +874,8 @@ gtk_label_set_attributes_internal (GtkLabel *label,
if (!label->use_markup && !label->use_underline)
{
pango_attr_list_ref (attrs);
if (attrs)
pango_attr_list_ref (attrs);
if (label->effective_attrs)
pango_attr_list_unref (label->effective_attrs);
label->effective_attrs = attrs;