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 Jun 30 18:25:41 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/atk-bridge/bridge.c	Thu Oct 16 16:01:19 2003
***************
*** 39,47 ****
  
  #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;
--- 39,48 ----
  
  #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;
***************
*** 154,160 ****
    atk_bridge_initialized = TRUE;
  
    if (debug_env_string)
!     _dbg = (int) g_ascii_strtod (debug_env_string, NULL);
  
    if (!bonobo_init (argc, argv ? *argv : NULL))
      {
--- 155,161 ----
    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 Jun 11 01:28:01 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/cspi/Makefile.am	Thu Oct 16 14:12:57 2003
***************
*** 44,47 ****
--- 44,48 ----
  	spi_value.c
  
  libcspi_la_LIBADD =		\
+ 	../libspi/libspi.la	\
  	bonobo/libcspi-bonobo.la
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	Thu Aug 28 14:44:57 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/registryd/deviceeventcontroller.c	Thu Oct 23 11:28:20 2003
***************
*** 1332,1342 ****
  {
    Accessibility_DeviceEvent key_event;
    KeySym keysym;
!   const int cbuf_bytes = 20;
!   char cbuf [cbuf_bytes+1];
    int nbytes;
  
!   nbytes = XLookupString (x_key_event, cbuf, cbuf_bytes, &keysym, NULL);  
    key_event.id = (CORBA_long)(keysym);
    key_event.hw_code = (CORBA_short) x_key_event->keycode;
    if (((XEvent *) x_key_event)->type == KeyPress)
--- 1332,1341 ----
  {
    Accessibility_DeviceEvent key_event;
    KeySym keysym;
!   char cbuf [21];
    int nbytes;
  
!   nbytes = XLookupString (x_key_event, cbuf, sizeof (cbuf), &keysym, NULL);  
    key_event.id = (CORBA_long)(keysym);
    key_event.hw_code = (CORBA_short) x_key_event->keycode;
    if (((XEvent *) x_key_event)->type == KeyPress)
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 Sep  8 19:32:52 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/registryd/registry.c	Thu Oct 16 14:13:37 2003
***************
*** 318,324 ****
        else
          {
  	  etype->minor = etype->major;
! 	  etype->detail = g_quark_from_static_string (""); //etype->major;
          }
      }
    else
--- 318,324 ----
        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	Wed Jun  4 00:47:54 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./at-spi/test/screen-review-test.c	Thu Oct 16 14:13:46 2003
***************
*** 331,340 ****
  {
  	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",
--- 331,340 ----
  {
  	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",