void
cspi_object_return (Accessible *accessible)
{
+ int old_ref_count;
g_return_if_fail (accessible != NULL);
if (!accessible->on_loan ||
else /* Convert to a permanant ref */
{
accessible->on_loan = FALSE;
+ old_ref_count = accessible->ref_count;
accessible->objref = cspi_dup_ref (accessible->objref);
- accessible->ref_count--;
+ if (old_ref_count != accessible->ref_count &&
+ accessible->ref_count == 1)
+ {
+ cspi_object_unref (accessible);
+ }
+ else
+ {
+ accessible->ref_count--;
+ }
}
}
return;
}
+ g_return_if_fail (accessible->ref_count > 0);
if (--accessible->ref_count == 0)
{
g_hash_table_remove (cspi_get_live_refs (), accessible->objref);
*
* 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)
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;
}
/**
if (live_refs)
{
leaked = g_hash_table_size (live_refs);
+#ifdef DEBUG_OBJECTS
+ fprintf (stderr, "Leaked %d SPI handles\n", leaked);
+
#define PRINT_LEAKS
#ifdef PRINT_LEAKS
g_hash_table_foreach (live_refs, report_leaked_ref, NULL);
#endif
+
+#endif
}
else
{
leaked = 0;
}
-#ifdef DEBUG_OBJECTS
- if (leaked)
- {
- fprintf (stderr, "Leaked %d SPI handles\n", leaked);
- }
-#endif
-
cspi_cleanup ();
- fprintf (stderr, "bye-bye!\n");
-
return leaked;
}
}
/**
+ * SPI_freeRect:
+ * @r: a pointer to an SPIRect returned from another at-spi call.
+ *
+ * Free a SPIRect structure returned from an at-spi call. Clients of
+ * at-spi should use this function instead of free () or g_free().
+ * A NULL rect @r will be silently ignored.
+ * This API should not be used to free data
+ * from other libraries or allocated by the client.
+ **/
+void
+SPI_freeRect (SPIRect *r)
+{
+ if (r)
+ {
+ /* err, okay, in this case the client _could_
+ have called g_free, but we don't want to guarantee it */
+ g_free (r);
+ }
+}
+
+/**
* DOCUMENT_ME!
**/
char *