Fix for bug #147648.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@684 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index 958ab0703fec35400daab34f85fd5824f71ea45e..380e101b6e18c27e6f0e65dc501f601a9eccc96e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-03 Bill Haneman <bill.haneman@sun.com>
+
+       * cspi/spi_main.c:
+       (SPI_init): Return error code '2' if the activated
+       registry cannot be pinged. Fixes bug #147648.
+       
 2004-07-28 Bill Haneman <bill.haneman@sun.com>
 
        * registryd/deviceeventcontroller.c:

diff --git a/NEWS b/NEWS
index 53d84fa508fe769353dbca81a1b58a35e484be2c..0b858b26369768366c61e6e6b82daccf545828ed 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+What's new in at-spi-1.5.4: 
+
+* Registration failure at SPI_init is now detected and
+  an error code is returned to the caller (bug #147648).
+
+* We now use polling as our default for detecting mouse
+  button changes (this was formerly our fallback method);
+  this prevents conflict with Xstroke.
+  [a better long-term fix requires the Xevie extension]
+
+
+============
+
 What's new in at-spi-1.5.3: 
 
 * New role EMBEDDED (bug #144415).

diff --git a/cspi/spi_main.c b/cspi/spi_main.c
index e179059ec900f6cb0bb2e2478cd5e28855430285..0b9ab8833b1f8ea980052014990b5c9dc117541b 100644 (file)
--- a/cspi/spi_main.c
+++ b/cspi/spi_main.c
@@ -365,7 +365,7 @@ static gboolean SPI_inited = FALSE;
  *
  * Connects to the accessibility registry and initializes the SPI.
  *
- * Returns: 0 on success, otherwise an integer error code.
+ * Returns: 0 on success, otherwise an integer error code.  
  **/
 int
 SPI_init (void)
@@ -382,8 +382,13 @@ SPI_init (void)
   registry = cspi_init ();
 
   g_atexit (cspi_cleanup);
-  
-  return 0;
+
+  /* fprintf (stderr, "registry=%x\n", (int) registry); */
+
+  if ((registry != CORBA_OBJECT_NIL) && (cspi_ping (registry)))
+      return 0;
+  else
+      return 2;
 }
 
 /**