[g-a-devel]Patch for bug 98269

["Padraig O'Briain" <Padraig Obriain Sun COM>]

Attached is a patch to fix bug 98269 and a few other minor issues.

OK to commit?

Padraig

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/at-spi/ChangeLog,v
retrieving revision 1.260
diff -u -p -r1.260 ChangeLog
--- ChangeLog	20 Nov 2002 00:17:12 -0000	1.260
+++ ChangeLog	20 Nov 2002 10:53:24 -0000
@@ -1,3 +1,16 @@
+2002-11-20  Padraig O'Briain  <padraig obriain sun com>
+
+	* cspi/spi_accessible.c
+	(cspi_init_role_table): Do not write beyond end of role_table.
+	(Accessible_getRole): Use correct type for value returned by
+	Accessibility_Accessible_getRole().
+
+	* libspi/accessible.c (spi_init_role_lookup_table): Do not write
+	beyond end of role_table. (This fixes bug #98269)
+
+	* libspi/applicationm.c: Add include file spi-private.h for 
+	definition of spi_init_any_nil.
+
 2002-11-19 Bill Haneman <bill haneman sun com>
 
         FIX for bug 99024.
Index: cspi/spi_accessible.c
===================================================================
RCS file: /cvs/gnome/at-spi/cspi/spi_accessible.c,v
retrieving revision 1.42
diff -u -p -r1.42 spi_accessible.c
--- cspi/spi_accessible.c	19 Nov 2002 13:48:54 -0000	1.42
+++ cspi/spi_accessible.c	20 Nov 2002 10:53:24 -0000
@@ -181,7 +181,6 @@ cspi_init_role_table (AccessibleRole *ro
   role_table [Accessibility_ROLE_FOOTER] = SPI_ROLE_FOOTER;
   role_table [Accessibility_ROLE_PARAGRAPH] = SPI_ROLE_PARAGRAPH;
   role_table [Accessibility_ROLE_RULER] = SPI_ROLE_RULER;
-  role_table [Accessibility_ROLE_LAST_DEFINED] = SPI_ROLE_EXTENDED;
 
   return TRUE;
 }
@@ -515,7 +514,7 @@ Accessible_getRelationSet (Accessible *o
 AccessibleRole
 Accessible_getRole (Accessible *obj)
 {
-  AccessibleRole retval;
+  Accessibility_Role retval;
 
   cspi_return_val_if_fail (obj != NULL, SPI_ROLE_INVALID);
 
Index: libspi/accessible.c
===================================================================
RCS file: /cvs/gnome/at-spi/libspi/accessible.c,v
retrieving revision 1.47
diff -u -p -r1.47 accessible.c
--- libspi/accessible.c	19 Nov 2002 13:48:56 -0000	1.47
+++ libspi/accessible.c	20 Nov 2002 10:53:24 -0000
@@ -118,7 +118,6 @@ spi_init_role_lookup_table (Accessibilit
   role_table [ATK_ROLE_FOOTER] =              Accessibility_ROLE_FOOTER;
   role_table [ATK_ROLE_PARAGRAPH] =           Accessibility_ROLE_PARAGRAPH;
   role_table [ATK_ROLE_RULER] =               Accessibility_ROLE_RULER;
-  role_table [ATK_ROLE_LAST_DEFINED] =        Accessibility_ROLE_EXTENDED;
   
   return TRUE;
 }
Index: libspi/application.c
===================================================================
RCS file: /cvs/gnome/at-spi/libspi/application.c,v
retrieving revision 1.22
diff -u -p -r1.22 application.c
--- libspi/application.c	19 Nov 2002 20:04:20 -0000	1.22
+++ libspi/application.c	20 Nov 2002 10:53:25 -0000
@@ -27,6 +27,7 @@
 #include <config.h>
 #include <atk/atkutil.h>
 #include <libspi/application.h>
+#include "spi-private.h"
 
 /* Our parent Gtk object type */
 #define PARENT_TYPE SPI_ACCESSIBLE_TYPE