summaryrefslogtreecommitdiff
path: root/atk-adaptor/accessible-cache.c
diff options
context:
space:
mode:
authorMike Gorse <mgorse@novell.com>2011-06-23 16:02:49 -0500
committerMike Gorse <mgorse@novell.com>2011-06-23 16:02:49 -0500
commitc72a4b4b0330733b2c2e0ed768d76ff85cd31500 (patch)
tree66c47a18e2b21226b519c013c1f5a9d89808f32a /atk-adaptor/accessible-cache.c
parentb6a9e880c09f13a391a2a23b0dd685a518fe61a1 (diff)
downloadat-spi2-core-c72a4b4b0330733b2c2e0ed768d76ff85cd31500.tar.gz
BGO#652858: Deregister objects on state-changed::defunct
When a state-change:defunct is received, remove the object from the dbus-path-to-object-mapping hash. Also, avoid enumerating an object's children in a call to GetItems if the object is marked defunct. This should mostly shield the ATK implementation from being called on objects that have been marked defunct. Also removed a seemingly unnecessary g_strdup/g_free pair.
Diffstat (limited to 'atk-adaptor/accessible-cache.c')
-rw-r--r--atk-adaptor/accessible-cache.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/atk-adaptor/accessible-cache.c b/atk-adaptor/accessible-cache.c
index 79a369fa..ad39819e 100644
--- a/atk-adaptor/accessible-cache.c
+++ b/atk-adaptor/accessible-cache.c
@@ -275,7 +275,8 @@ add_pending_items (gpointer data)
{
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);
}