gtk+ r21353 - in branches/gtk-2-12: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Fri Sep 12 03:02:01 2008
New Revision: 21353
URL: http://svn.gnome.org/viewvc/gtk+?rev=21353&view=rev

Log:
        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.



Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gtk/gtkcellview.c

Modified: branches/gtk-2-12/gtk/gtkcellview.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkcellview.c	(original)
+++ branches/gtk-2-12/gtk/gtkcellview.c	Fri Sep 12 03:02:01 2008
@@ -1105,7 +1105,8 @@
 					  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 @@
   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);
 }