projects
/
platform
/
core
/
uifw
/
at-spi2-atk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't cache objects that return NULL when their state set is queried
[platform/core/uifw/at-spi2-atk.git]
/
atk-adaptor
/
accessible-cache.c
diff --git
a/atk-adaptor/accessible-cache.c
b/atk-adaptor/accessible-cache.c
index
fa6b561
..
20796d5
100644
(file)
--- a/
atk-adaptor/accessible-cache.c
+++ b/
atk-adaptor/accessible-cache.c
@@
-179,6
+179,8
@@
remove_object (GObject * source, GObject * gobj, gpointer data)
g_signal_emit (cache, cache_signals [OBJECT_REMOVED], 0, gobj);
g_hash_table_remove (cache->objects, gobj);
}
g_signal_emit (cache, cache_signals [OBJECT_REMOVED], 0, gobj);
g_hash_table_remove (cache->objects, gobj);
}
+ else
+ g_queue_remove (cache->add_traversal, gobj);
}
static void
}
static void
@@
-279,7
+281,7
@@
add_pending_items (gpointer data)
current = g_queue_pop_head (cache->add_traversal);
set = atk_object_ref_state_set (current);
current = g_queue_pop_head (cache->add_traversal);
set = atk_object_ref_state_set (current);
- if (!atk_state_set_contains_state (set, ATK_STATE_TRANSIENT))
+ if (
set &&
!atk_state_set_contains_state (set, ATK_STATE_TRANSIENT))
{
g_queue_push_tail (to_add, current);
if (!spi_cache_in (cache, G_OBJECT (current)) &&
{
g_queue_push_tail (to_add, current);
if (!spi_cache_in (cache, G_OBJECT (current)) &&
@@
-290,7
+292,8
@@
add_pending_items (gpointer data)
}
}
}
}
- g_object_unref (set);
+ if (set)
+ g_object_unref (set);
}
while (!g_queue_is_empty (to_add))
}
while (!g_queue_is_empty (to_add))