GitLab repository storage has been migrated to hashed layout. Please contact Infrastructure team if you notice any issues with repositories or hooks.

Commit 79fceb3a authored by Kristian Rietveld's avatar Kristian Rietveld Committed by Kristian Rietveld

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).
parent 1719b20a
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).
Sat Jul 12 15:51:33 2003 Kristian Rietveld <kris@gtk.org>
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).
Sat Jul 12 15:51:33 2003 Kristian Rietveld <kris@gtk.org>
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).
Sat Jul 12 15:51:33 2003 Kristian Rietveld <kris@gtk.org>
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).
Sat Jul 12 15:51:33 2003 Kristian Rietveld <kris@gtk.org>
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).
Sat Jul 12 15:51:33 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
......
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment