request to apply fix for gtktreeview accessibility

[Bill Haneman <Bill Haneman Sun COM>]

Hi:

In an attempt to fix bug 326362
http://bugzilla.gnome.org/show_bug.cgi?id=326362

an incorrect fix was applied to gailtreeview.c on about Feb 21.  This
caused a serious regression which makes Gnome-2.14 useless to blind
users.

We have identified the problem with the original fix, and have traced
the root cause of the crash to gtk+.  In both cases we have one-line
code changes which revert the incorrect fix to gail, and which prevent
the gtk+ segfault.

I am requesting permission to apply the following two patches.  In
particular I would like permission to apply the gail patch, which
reverts the bad fix; however it seems reasonable to apply a more correct
fix (to gtk+) at the same time.  If the gtk+ team would rather do the
latter, that's fine by me.

Thanks,

Bill


Index: gail/gailtreeview.c
===================================================================
RCS file: /cvs/gnome/gail/gail/gailtreeview.c,v
retrieving revision 1.187
diff -u -r1.187 gailtreeview.c
--- gail/gailtreeview.c	24 Feb 2006 14:37:04 -0000	1.187
+++ gail/gailtreeview.c	10 Mar 2006 15:21:30 -0000
@@ -4315,8 +4315,7 @@
 {
   GtkTreeIter child_iter;
   
-  if (!model || !iter)
-    return;
+  if (!model) return;
 
   level++;
 

? treemodelfilter-segv-fix.diff
Index: gtk/gtktreemodelfilter.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktreemodelfilter.c,v
retrieving revision 1.31
diff -u -r1.31 gtktreemodelfilter.c
--- gtk/gtktreemodelfilter.c	24 Aug 2005 04:36:12 -0000	1.31
+++ gtk/gtktreemodelfilter.c	10 Mar 2006 15:11:38 -0000
@@ -2067,7 +2067,7 @@
   /* FIXME: we should prolly count the visible nodes here, just like in
    * _iter_n_children.
    */
-  if (elt->children && elt->children->array->len > 0)
+  if (elt->children && elt->children->array && elt->children->array->len > 0)
     return TRUE;
 
   return FALSE;