diff options
| author | Kristian Rietveld <kris@gtk.org> | 2003-07-12 14:04:42 +0000 |
|---|---|---|
| committer | Kristian Rietveld <kristian@src.gnome.org> | 2003-07-12 14:04:42 +0000 |
| commit | 79fceb3a8bf3511b3926c097eb99d15d2ea4950f (patch) | |
| tree | 4705b436aada9e9918244c6fcd0f5cc44e3248c1 /gtk/gtkcellrenderertext.c | |
| parent | 1719b20af47831294dc003a0f55cabceffc33741 (diff) | |
| download | gdk-pixbuf-79fceb3a8bf3511b3926c097eb99d15d2ea4950f.tar.gz | |
Merged from stable.
Sat Jul 12 16:01:03 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_set_property):
free the old text and extra_attrs *after* we parsed the new
markup string. (Fixes #114485, reported by Owen Taylor).
Diffstat (limited to 'gtk/gtkcellrenderertext.c')
| -rw-r--r-- | gtk/gtkcellrenderertext.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 9e3ee6247..210cbc483 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -825,12 +825,6 @@ gtk_cell_renderer_text_set_property (GObject *object, gchar *text = NULL; GError *error = NULL; PangoAttrList *attrs = NULL; - - if (celltext->text) - g_free (celltext->text); - - if (celltext->extra_attrs) - pango_attr_list_unref (celltext->extra_attrs); str = g_value_get_string (value); if (str && !pango_parse_markup (str, @@ -846,7 +840,13 @@ gtk_cell_renderer_text_set_property (GObject *object, g_error_free (error); return; } - + + if (celltext->text) + g_free (celltext->text); + + if (celltext->extra_attrs) + pango_attr_list_unref (celltext->extra_attrs); + celltext->text = text; celltext->extra_attrs = attrs; } |