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).

diff --git a/ChangeLog b/ChangeLog
index 7a3784099909585d7228d54e6a8c4b3223fe2f17..3c1ccb316040babd8cd47becff406f9878dcb5ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        Merged from stable.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7a3784099909585d7228d54e6a8c4b3223fe2f17..3c1ccb316040babd8cd47becff406f9878dcb5ed 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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>
 
        Merged from stable.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7a3784099909585d7228d54e6a8c4b3223fe2f17..3c1ccb316040babd8cd47becff406f9878dcb5ed 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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>
 
        Merged from stable.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7a3784099909585d7228d54e6a8c4b3223fe2f17..3c1ccb316040babd8cd47becff406f9878dcb5ed 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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>
 
        Merged from stable.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7a3784099909585d7228d54e6a8c4b3223fe2f17..3c1ccb316040babd8cd47becff406f9878dcb5ed 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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>
 
        Merged from stable.

diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index 9e3ee6247d6df5d25e2b7580e769f7a43783e568..210cbc48315bf04fe3e67a71995fd84bba0cd82a 100644 (file)
--- 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;
       }