callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged from stable.

Browse Source 
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).
This commit is contained in:
Kristian Rietveld
2003-07-12 14:04:42 +00:00
committed by Kristian Rietveld
parent 1719b20af4
commit 79fceb3a8b
6 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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> Sat Jul 12 15:51:33 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable. Merged from stable.

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
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> Sat Jul 12 15:51:33 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable. Merged from stable.

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
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> Sat Jul 12 15:51:33 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable. Merged from stable.

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
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> Sat Jul 12 15:51:33 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable. Merged from stable.

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
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> Sat Jul 12 15:51:33 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable. Merged from stable.

14
gtk/gtkcellrenderertext.c
View File

@ -825,12 +825,6 @@ gtk_cell_renderer_text_set_property (GObject *object,
gchar *text = NULL; gchar *text = NULL;
GError *error = NULL; GError *error = NULL;
PangoAttrList *attrs = 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); str = g_value_get_string (value);
if (str && !pango_parse_markup (str, if (str && !pango_parse_markup (str,
@ -846,7 +840,13 @@ gtk_cell_renderer_text_set_property (GObject *object,
g_error_free (error); g_error_free (error);
return; return;
} }
if (celltext->text)
g_free (celltext->text);
if (celltext->extra_attrs)
pango_attr_list_unref (celltext->extra_attrs);
celltext->text = text; celltext->text = text;
celltext->extra_attrs = attrs; celltext->extra_attrs = attrs;
} }