Don't blindly chain up in the buildable implementation. Reported by Kevin

* gtk/gtkcellview.c: Don't blindly chain up in the buildable
        implementation.  Reported by Kevin Ryde.



svn path=/trunk/; revision=20802
This commit is contained in:
Matthias Clasen 2008-07-07 02:45:51 +00:00
parent 32f19c389b
commit 99836c6528
2 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,11 @@
2008-07-06 Matthias Clasen <mclasen@redhat.com>
Bug 528845 segv from GtkBuilder on attempting <accelerator> under
GtkCellView
* gtk/gtkcellview.c: Don't blindly chain up in the buildable
implementation. Reported by Kevin Ryde.
2008-07-06 Matthias Clasen <mclasen@redhat.com>
Bug 469068 clarify gdk_cairo_create()

View File

@ -1086,7 +1086,8 @@ gtk_cell_view_buildable_custom_tag_start (GtkBuildable *buildable,
GMarkupParser *parser,
gpointer *data)
{
if (parent_buildable_iface->custom_tag_start (buildable, builder, child,
if (parent_buildable_iface->custom_tag_start &&
parent_buildable_iface->custom_tag_start (buildable, builder, child,
tagname, parser, data))
return TRUE;
@ -1104,7 +1105,7 @@ gtk_cell_view_buildable_custom_tag_end (GtkBuildable *buildable,
if (strcmp (tagname, "attributes") == 0)
_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname,
data);
else
else if (parent_buildable_iface->custom_tag_end)
parent_buildable_iface->custom_tag_end (buildable, builder, child, tagname,
data);
}