AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

clear the extra_attrs list if we set "text" after "markup". (Fixes

Browse Source 
Thu Dec 18 17:52:56 2003  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_set_property):
	clear the extra_attrs list if we set "text" after "markup".
	(Fixes #121933, Federico Mena Quintero).
This commit is contained in:
Kristian Rietveld 2003-12-18 16:55:58 +00:00 committed by Kristian Rietveld
parent 0fe8b2d6d5
commit 10b2c91b23
6 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Dec 18 17:52:56 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_set_property):
clear the extra_attrs list if we set "text" after "markup".
(Fixes #121933, Federico Mena Quintero).
2003-12-18 Alexander Larsson <alexl@redhat.com> 2003-12-18 Alexander Larsson <alexl@redhat.com>
* gtk/gtkicontheme.c (gtk_icon_info_get_embedded_rect): * gtk/gtkicontheme.c (gtk_icon_info_get_embedded_rect):

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Thu Dec 18 17:52:56 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_set_property):
clear the extra_attrs list if we set "text" after "markup".
(Fixes #121933, Federico Mena Quintero).
2003-12-18 Alexander Larsson <alexl@redhat.com> 2003-12-18 Alexander Larsson <alexl@redhat.com>
* gtk/gtkicontheme.c (gtk_icon_info_get_embedded_rect): * gtk/gtkicontheme.c (gtk_icon_info_get_embedded_rect):

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Thu Dec 18 17:52:56 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_set_property):
clear the extra_attrs list if we set "text" after "markup".
(Fixes #121933, Federico Mena Quintero).
2003-12-18 Alexander Larsson <alexl@redhat.com> 2003-12-18 Alexander Larsson <alexl@redhat.com>
* gtk/gtkicontheme.c (gtk_icon_info_get_embedded_rect): * gtk/gtkicontheme.c (gtk_icon_info_get_embedded_rect):

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Thu Dec 18 17:52:56 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_set_property):
clear the extra_attrs list if we set "text" after "markup".
(Fixes #121933, Federico Mena Quintero).
2003-12-18 Alexander Larsson <alexl@redhat.com> 2003-12-18 Alexander Larsson <alexl@redhat.com>
* gtk/gtkicontheme.c (gtk_icon_info_get_embedded_rect): * gtk/gtkicontheme.c (gtk_icon_info_get_embedded_rect):

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Thu Dec 18 17:52:56 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_set_property):
clear the extra_attrs list if we set "text" after "markup".
(Fixes #121933, Federico Mena Quintero).
2003-12-18 Alexander Larsson <alexl@redhat.com> 2003-12-18 Alexander Larsson <alexl@redhat.com>
* gtk/gtkicontheme.c (gtk_icon_info_get_embedded_rect): * gtk/gtkicontheme.c (gtk_icon_info_get_embedded_rect):

11
gtk/gtkcellrenderertext.c
View File

@ -123,6 +123,7 @@ struct _GtkCellRendererTextPrivate
{ {
guint single_paragraph : 1; guint single_paragraph : 1;
guint language_set : 1; guint language_set : 1;
guint markup_set : 1;
gulong focus_out_id; gulong focus_out_id;
PangoLanguage *language; PangoLanguage *language;
@ -870,6 +871,15 @@ gtk_cell_renderer_text_set_property (GObject *object,
case PROP_TEXT: case PROP_TEXT:
if (celltext->text) if (celltext->text)
g_free (celltext->text); g_free (celltext->text);
if (priv->markup_set)
{
if (celltext->extra_attrs)
pango_attr_list_unref (celltext->extra_attrs);
celltext->extra_attrs = NULL;
priv->markup_set = FALSE;
}
celltext->text = g_strdup (g_value_get_string (value)); celltext->text = g_strdup (g_value_get_string (value));
g_object_notify (object, "text"); g_object_notify (object, "text");
break; break;
@ -912,6 +922,7 @@ gtk_cell_renderer_text_set_property (GObject *object,
celltext->text = text; celltext->text = text;
celltext->extra_attrs = attrs; celltext->extra_attrs = attrs;
priv->markup_set = TRUE;
} }
break; break;