rendered paste bodydiff -NurdB at-spi-1.7.12/atk-bridge/bridge.c at-spi-1.7.12-patched/atk-bridge/bridge.c
--- at-spi-1.7.12/atk-bridge/bridge.c 2006-09-20 08:21:57.000000000 -0500
+++ at-spi-1.7.12-patched/atk-bridge/bridge.c 2006-11-15 04:06:29.000000000 -0500
@@ -353,9 +353,17 @@
if (ev._major != CORBA_NO_EXCEPTION)
{
+ const CORBA_char *id = CORBA_exception_id (&ev);
+
g_error ("Accessibility app error: exception during "
- "registry activation from id: %s\n",
- CORBA_exception_id (&ev));
+ "registry activation from id: %s\n", id);
+
+ if (strcmp(id, "IDL:Bonobo/GeneralError:1.0") == 0)
+ {
+ Bonobo_GeneralError* ge = CORBA_exception_value(ev);
+ g_error ("Bonobo activation error: %s\n", ge->description);
+ }
+
CORBA_exception_free (&ev);
}
diff -NurdB at-spi-1.7.12/test/Makefile.am at-spi-1.7.12-patched/test/Makefile.am
--- at-spi-1.7.12/test/Makefile.am 2006-08-17 11:44:33.000000000 -0500
+++ at-spi-1.7.12-patched/test/Makefile.am 2006-11-14 13:47:50.000000000 -0500
@@ -43,5 +43,7 @@
TESTS_ENVIRONMENT = \
LD_LIBRARY_PATH=$(top_builddir)/libspi/.libs/:$(top_builddir)/cspi/.libs/ \
- PATH=$(top_builddir)/registryd/.libs
+ PATH=$(top_builddir)/registryd/.libs:$(PATH)
+start-registryd:
+ $(TESTS_ENVIRONMENT) $(top_builddir)/registryd/at-spi-registryd
diff -NurdB at-spi-1.7.12/test/test-simple.c at-spi-1.7.12-patched/test/test-simple.c
--- at-spi-1.7.12/test/test-simple.c 2005-11-02 13:01:24.000000000 -0500
+++ at-spi-1.7.12-patched/test/test-simple.c 2006-11-14 10:37:29.000000000 -0500
@@ -714,7 +714,7 @@
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 @@
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);