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
Remove erroneous debug print introduced in last commit
[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
943a320
..
afaedb0
100644
(file)
--- a/
atk-adaptor/accessible-cache.c
+++ b/
atk-adaptor/accessible-cache.c
@@
-281,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)) &&
@@
-292,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))
@@
-320,9
+321,7
@@
child_added_listener (GSignalInvocationHint * signal_hint,
const GValue * param_values, gpointer data)
{
SpiCache *cache = spi_global_cache;
const GValue * param_values, gpointer data)
{
SpiCache *cache = spi_global_cache;
- gboolean child_needs_ref = TRUE;
AtkObject *accessible;
AtkObject *accessible;
- AtkObject *child;
const gchar *detail = NULL;
const gchar *detail = NULL;
@@
-351,14
+350,13
@@
child_added_listener (GSignalInvocationHint * signal_hint,
gpointer child;
int index = g_value_get_uint (param_values + 1);
child = g_value_get_pointer (param_values + 2);
gpointer child;
int index = g_value_get_uint (param_values + 1);
child = g_value_get_pointer (param_values + 2);
-
- if (!ATK_IS_OBJECT (child))
+ if (!child)
{
{
-
child = atk_object_ref_accessible_child (accessible, ind
ex);
-
child_needs_ref = FALSE
;
+
g_static_rec_mutex_unlock (&cache_mut
ex);
+
return
;
}
}
- if (child_needs_ref)
-
g_object_ref (child);
+
+ g_object_ref (child);
g_queue_push_tail (cache->add_traversal, child);
if (cache->add_pending_idle == 0)
g_queue_push_tail (cache->add_traversal, child);
if (cache->add_pending_idle == 0)
@@
-424,6
+422,9
@@
spi_cache_foreach (SpiCache * cache, GHFunc func, gpointer data)
gboolean
spi_cache_in (SpiCache * cache, GObject * object)
{
gboolean
spi_cache_in (SpiCache * cache, GObject * object)
{
+ if (!cache)
+ return FALSE;
+
if (g_hash_table_lookup_extended (cache->objects,
object,
NULL,
if (g_hash_table_lookup_extended (cache->objects,
object,
NULL,