From 79fceb3a8bf3511b3926c097eb99d15d2ea4950f Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Sat, 12 Jul 2003 14:04:42 +0000 Subject: [PATCH] Merged from stable. Sat Jul 12 16:01:03 2003 Kristian Rietveld 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). --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtkcellrenderertext.c | 14 +++++++------- 6 files changed, 47 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a37840999..3c1ccb3160 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sat Jul 12 16:01:03 2003 Kristian Rietveld + + 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). + Sat Jul 12 15:51:33 2003 Kristian Rietveld Merged from stable. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7a37840999..3c1ccb3160 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Sat Jul 12 16:01:03 2003 Kristian Rietveld + + 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). + Sat Jul 12 15:51:33 2003 Kristian Rietveld Merged from stable. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7a37840999..3c1ccb3160 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Sat Jul 12 16:01:03 2003 Kristian Rietveld + + 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). + Sat Jul 12 15:51:33 2003 Kristian Rietveld Merged from stable. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7a37840999..3c1ccb3160 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Sat Jul 12 16:01:03 2003 Kristian Rietveld + + 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). + Sat Jul 12 15:51:33 2003 Kristian Rietveld Merged from stable. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7a37840999..3c1ccb3160 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Sat Jul 12 16:01:03 2003 Kristian Rietveld + + 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). + Sat Jul 12 15:51:33 2003 Kristian Rietveld Merged from stable. diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 9e3ee6247d..210cbc4831 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; }