diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN at-spi-1.19.3.orig/atk-bridge/bridge.c at-spi-1.19.3/atk-bridge/bridge.c
--- at-spi-1.19.3.orig/atk-bridge/bridge.c	2007-04-28 02:56:51.000000000 -0400
+++ at-spi-1.19.3/atk-bridge/bridge.c	2007-06-04 13:29:46.000000000 -0400
@@ -435,10 +435,23 @@ spi_atk_bridge_get_registry (void)
 	  
       if (ev._major != CORBA_NO_EXCEPTION)
         {
+		  gchar *err_desc = NULL;
+		  const CORBA_char *id = CORBA_exception_id (&ev);
+
+		  if (strcmp(id, "IDL:Bonobo/GeneralError:1.0") == 0)
+		  {
+			  Bonobo_GeneralError* ge = CORBA_exception_value (&ev);
+			  err_desc = g_strdup_printf ("bonobo activation problem: %s",
+				  ge->description);
+		  }
+
           g_error ("Accessibility app error: exception during "
-		   "registry activation from id: %s\n",
-		   CORBA_exception_id (&ev));
+			   "registry activation from id: %s\n"
+			   "Error description: %s\n", id, err_desc == NULL ? "-" : err_desc);
+
           CORBA_exception_free (&ev);
+		  if (err_desc != NULL)
+			  g_free (err_desc);
         }
 	  
       if (registry_died && registry) 
diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN at-spi-1.19.3.orig/test/Makefile.am at-spi-1.19.3/test/Makefile.am
--- at-spi-1.19.3.orig/test/Makefile.am	2007-05-22 05:40:43.000000000 -0400
+++ at-spi-1.19.3/test/Makefile.am	2007-06-04 13:31:11.000000000 -0400
@@ -37,11 +37,18 @@ INCLUDES = -I$(top_srcdir)           \
 	   $(TESTS_CFLAGS)	     \
 	   $(DEBUG_CFLAGS)
 
-LDADD = ../libspi/libspi.la ../cspi/libcspi.la ../login-helper/libloginhelper.la $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS)
+LDADD = ../libspi/libspi.la ../cspi/libcspi.la ../login-helper/libloginhelper.la ../atk-bridge/libatk-bridge.la $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS)
 
 TESTS = test-simple
 
 TESTS_ENVIRONMENT =					\
-	LD_LIBRARY_PATH=$(top_builddir)/libspi/.libs/:$(top_builddir)/cspi/.libs/	\
-	PATH=$(top_builddir)/registryd/.libs/:$(PATH)
+	BONOBO_ACTIVATION_PATH=$(top_builddir)/test
+
+BUILT_SOURCES = Accessibility_Registry.server
+
+Accessibility_Registry.server:
+	rm -f Accessibility_Registry.server
+	sed -e "s,@REGISTRYD_PATH\@,`which libtool` --mode=execute `pwd`/../registryd,g" \
+		$(top_builddir)/registryd/Accessibility_Registry.server.in.in > \
+		Accessibility_Registry.server
 
diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN at-spi-1.19.3.orig/test/test-simple.c at-spi-1.19.3/test/test-simple.c
--- at-spi-1.19.3.orig/test/test-simple.c	2007-01-09 22:08:21.000000000 -0500
+++ at-spi-1.19.3/test/test-simple.c	2007-06-04 13:29:46.000000000 -0400
@@ -714,7 +714,7 @@ test_keylisteners (void)
 	key_listener = SPI_createAccessibleKeystrokeListener (
 		key_listener_cb, &stroke);
 
-	test_keyset = SPI_createAccessibleKeySet (1, "=", NULL, NULL);
+	test_keyset = SPI_createAccessibleKeySet (1, "t", NULL, NULL);
 
 	g_assert (SPI_registerAccessibleKeystrokeListener (
 		key_listener,
@@ -725,11 +725,11 @@ test_keylisteners (void)
 
 	for (i = 0; i < 3; i++) {
 		memset (&stroke, 0, sizeof (AccessibleKeystroke));
-		g_assert (SPI_generateKeyboardEvent ('=', NULL, SPI_KEY_SYM));
+		g_assert (SPI_generateKeyboardEvent ('t', NULL, SPI_KEY_SYM));
 		while (!(key_press_received))
 			g_main_context_iteration (NULL, TRUE);
 		fprintf (stderr, "p [%s]", stroke.keystring);
-	        g_assert (!strcmp (stroke.keystring, "="));
+	        g_assert (!strcmp (stroke.keystring, "t"));
 		while (!(key_release_received))
 			g_main_context_iteration (NULL, TRUE);
 		fprintf (stderr, "r [%s]", stroke.keystring);