{
g_queue_push_tail (to_add, current);
if (!spi_cache_in (cache, G_OBJECT (current)) &&
- !atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS))
+ !atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS) &&
+ !atk_state_set_contains_state (set, ATK_STATE_DEFUNCT))
{
append_children (current, cache->add_traversal);
}
deregister_object (gpointer data, GObject * gobj)
{
SpiRegister *reg = SPI_REGISTER (data);
+
+ spi_register_deregister_object (reg, gobj);
+}
+
+void
+spi_register_deregister_object (SpiRegister *reg, GObject *gobj)
+{
guint ref;
ref = object_to_ref (gobj);
gchar *
spi_register_root_object_path ();
+void
+spi_register_deregister_object (SpiRegister *reg, GObject *gobj);
+
/*---------------------------------------------------------------------------*/
#endif /* ACCESSIBLE_REGISTER_H */
/* Marshall children */
dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "(so)",
&iter_sub_array);
- if (!atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS))
+ if (!atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS) &&
+ !atk_state_set_contains_state (set, ATK_STATE_DEFUNCT))
{
gint childcount, i;
guint detail1;
accessible = ATK_OBJECT (g_value_get_object (¶m_values[0]));
- pname = g_strdup (g_value_get_string (¶m_values[1]));
+ pname = g_value_get_string (¶m_values[1]);
- /* TODO - Possibly ignore a change to the 'defunct' state.
- * This is because without reference counting defunct objects should be removed.
- */
detail1 = (g_value_get_boolean (¶m_values[2])) ? 1 : 0;
emit_event (accessible, ITF_EVENT_OBJECT, STATE_CHANGED, pname, detail1, 0,
DBUS_TYPE_INT32_AS_STRING, 0, append_basic);
- g_free (pname);
+
+ if (!g_strcmp0 (pname, "defunct"))
+ spi_register_deregister_object (spi_global_register, G_OBJECT (accessible));
return TRUE;
}