diff -crN ./at-spi/atk-bridge/bridge.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/atk-bridge/bridge.c
*** ./at-spi/atk-bridge/bridge.c	Mon Dec 16 19:03:45 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/atk-bridge/bridge.c	Wed Apr  9 15:00:51 2003
***************
*** 38,46 ****
  
  #undef SPI_BRIDGE_DEBUG
  
! #define DBG(a,b) if(_dbg>=(a))b
  
! static int _dbg = 0;
  static CORBA_Environment ev;
  static Accessibility_Registry registry = CORBA_OBJECT_NIL;
  static Accessibility_DeviceEventController device_event_controller = CORBA_OBJECT_NIL;
--- 38,47 ----
  
  #undef SPI_BRIDGE_DEBUG
  
! #undef DBG
! #define DBG(a,b) if(atk_bridge_dbg>=(a))b
  
! static int atk_bridge_dbg = 0;
  static CORBA_Environment ev;
  static Accessibility_Registry registry = CORBA_OBJECT_NIL;
  static Accessibility_DeviceEventController device_event_controller = CORBA_OBJECT_NIL;
***************
*** 145,151 ****
    atk_bridge_initialized = TRUE;
  
    if (debug_env_string)
!     _dbg = (int) g_ascii_strtod (debug_env_string, NULL);
  
    if (!bonobo_init (argc, argv ? *argv : NULL))
      {
--- 146,152 ----
    atk_bridge_initialized = TRUE;
  
    if (debug_env_string)
!     atk_bridge_dbg = (int) g_ascii_strtod (debug_env_string, NULL);
  
    if (!bonobo_init (argc, argv ? *argv : NULL))
      {
diff -crN ./at-spi/cspi/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/cspi/Makefile.am
*** ./at-spi/cspi/Makefile.am	Wed Aug 28 16:40:20 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/cspi/Makefile.am	Mon Nov 18 17:26:49 2002
***************
*** 43,46 ****
--- 43,47 ----
  	spi_value.c
  
  libcspi_la_LIBADD =		\
+ 	../libspi/libspi.la	\
  	bonobo/libcspi-bonobo.la
diff -crN ./at-spi/libspi/accessible.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/libspi/accessible.c
*** ./at-spi/libspi/accessible.c	Wed Nov 20 12:23:11 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/libspi/accessible.c	Tue Feb 25 13:06:57 2003
***************
*** 432,438 ****
  BONOBO_TYPE_FUNC_FULL (SpiAccessible,
  		       Accessibility_Accessible,
  		       PARENT_TYPE,
! 		       spi_accessible);
  
  static GHashTable *public_corba_refs = NULL;
  
--- 432,438 ----
  BONOBO_TYPE_FUNC_FULL (SpiAccessible,
  		       Accessibility_Accessible,
  		       PARENT_TYPE,
! 		       spi_accessible)
  
  static GHashTable *public_corba_refs = NULL;
  
diff -crN ./at-spi/registryd/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/registryd/Makefile.am
*** ./at-spi/registryd/Makefile.am	Thu Sep 19 09:19:49 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/registryd/Makefile.am	Tue Feb 25 13:09:45 2003
***************
*** 1,3 ****
--- 1,5 ----
+ bin_PROGRAMS = at-spi-registryd
+ 
  server_dot_in = Accessibility_Registry.server.in
  
  $(server_dot_in): $(server_dot_in).in
diff -crN ./at-spi/registryd/deviceeventcontroller.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/registryd/deviceeventcontroller.c
*** ./at-spi/registryd/deviceeventcontroller.c	Wed Dec 18 16:28:41 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/registryd/deviceeventcontroller.c	Wed Apr  9 14:58:02 2003
***************
*** 32,37 ****
--- 32,38 ----
  #include <string.h>
  #include <ctype.h>
  #include <stdio.h>
+ #include <sys/time.h>
  #include <bonobo/bonobo-exception.h>
  
  #include <X11/Xlib.h>
***************
*** 1211,1218 ****
  {
    Accessibility_DeviceEvent key_event;
    KeySym keysym;
!   const int cbuf_bytes = 20;
!   char cbuf [cbuf_bytes];
    
    keysym = XLookupKeysym (x_key_event, 0);
    key_event.id = (CORBA_long)(keysym);
--- 1212,1218 ----
  {
    Accessibility_DeviceEvent key_event;
    KeySym keysym;
!   char cbuf [20];
    
    keysym = XLookupKeysym (x_key_event, 0);
    key_event.id = (CORBA_long)(keysym);
***************
*** 1308,1314 ****
          key_event.event_string = CORBA_string_dup ("Right");
  	break;
        default:
!         if (XLookupString (x_key_event, cbuf, cbuf_bytes, &keysym, NULL) > 0)
            {
              key_event.event_string = CORBA_string_dup (cbuf);
  	    if (isgraph (keysym))
--- 1308,1314 ----
          key_event.event_string = CORBA_string_dup ("Right");
  	break;
        default:
!         if (XLookupString (x_key_event, cbuf, sizeof(cbuf), &keysym, NULL) > 0)
            {
              key_event.event_string = CORBA_string_dup (cbuf);
  	    if (isgraph (keysym))
diff -crN ./at-spi/registryd/registry.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/registryd/registry.c
*** ./at-spi/registryd/registry.c	Mon Dec 16 19:04:13 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/registryd/registry.c	Tue Feb 25 13:20:23 2003
***************
*** 312,318 ****
        else
          {
  	  etype->minor = etype->major;
! 	  etype->detail = g_quark_from_static_string (""); //etype->major;
          }
      }
    else
--- 312,318 ----
        else
          {
  	  etype->minor = etype->major;
! 	  etype->detail = g_quark_from_static_string (""); /*etype->major;*/
          }
      }
    else
diff -crN ./at-spi/test/screen-review-test.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/test/screen-review-test.c
*** ./at-spi/test/screen-review-test.c	Fri Sep 13 15:09:04 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/test/screen-review-test.c	Tue Feb 25 13:24:21 2003
***************
*** 329,338 ****
  {
  	GList *target, *iter = next, *prev;
  	prev = iter->prev;
! //	if (chunk->string && strlen (chunk->string)) { 
  		text_chunk_list =
  			g_list_insert_before (text_chunk_list, next, chunk);
! //	}
  	while (iter && CHUNK_BOUNDS_SPANS_END (chunk, (TextChunk *)iter->data)) {
  #ifdef CLIP_DEBUG			
  			fprintf (stderr, "deleting %s\n",
--- 329,338 ----
  {
  	GList *target, *iter = next, *prev;
  	prev = iter->prev;
! /*	if (chunk->string && strlen (chunk->string)) { */
  		text_chunk_list =
  			g_list_insert_before (text_chunk_list, next, chunk);
! /*	}*/
  	while (iter && CHUNK_BOUNDS_SPANS_END (chunk, (TextChunk *)iter->data)) {
  #ifdef CLIP_DEBUG			
  			fprintf (stderr, "deleting %s\n",
