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.


svn path=/branches/gtk-2-12/; revision=21353

2 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 6a852f62da..88b370ba32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,16 @@
 
 	Merged from trunk:
 
+	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-09-11  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
 	Bug 541645 – gtkfilechooserdefault segfaults when bookmark does not
 	contain ://
 
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 5e6939ddab..42f75780b7 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -1105,7 +1105,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;
 
@@ -1123,7 +1124,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);
 }