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
Properly clean up when timing out on a keystroke listener
[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
79a369f
..
5065a00
100644
(file)
--- a/
atk-adaptor/accessible-cache.c
+++ b/
atk-adaptor/accessible-cache.c
@@
-55,9
+55,6
@@
add_pending_items (gpointer data);
static void
spi_cache_finalize (GObject * object);
static void
spi_cache_finalize (GObject * object);
-static void
-spi_cache_dispose (GObject * object);
-
/*---------------------------------------------------------------------------*/
enum
/*---------------------------------------------------------------------------*/
enum
@@
-79,7
+76,6
@@
static void spi_cache_class_init (SpiCacheClass * klass)
spi_cache_parent_class = g_type_class_ref (G_TYPE_OBJECT);
object_class->finalize = spi_cache_finalize;
spi_cache_parent_class = g_type_class_ref (G_TYPE_OBJECT);
object_class->finalize = spi_cache_finalize;
- object_class->dispose = spi_cache_dispose;
cache_signals [OBJECT_ADDED] = \
g_signal_new ("object-added",
cache_signals [OBJECT_ADDED] = \
g_signal_new ("object-added",
@@
-125,8
+121,8
@@
spi_cache_init (SpiCache * cache)
add_subtree (cache, spi_global_app_data->root);
add_subtree (cache, spi_global_app_data->root);
- atk_add_global_event_listener (child_added_listener,
- "Gtk:AtkObject:children-changed");
+
cache->child_added_listener =
atk_add_global_event_listener (child_added_listener,
+ "Gtk:AtkObject:children-changed");
g_signal_connect (G_OBJECT (spi_global_app_data->root),
"children-changed::add",
g_signal_connect (G_OBJECT (spi_global_app_data->root),
"children-changed::add",
@@
-141,17
+137,17
@@
spi_cache_finalize (GObject * object)
while (!g_queue_is_empty (cache->add_traversal))
g_object_unref (G_OBJECT (g_queue_pop_head (cache->add_traversal)));
g_queue_free (cache->add_traversal);
while (!g_queue_is_empty (cache->add_traversal))
g_object_unref (G_OBJECT (g_queue_pop_head (cache->add_traversal)));
g_queue_free (cache->add_traversal);
- g_
free
(cache->objects);
+ g_
hash_table_unref
(cache->objects);
- G_OBJECT_CLASS (spi_cache_parent_class)->finalize (object);
-}
+ g_signal_handlers_disconnect_by_func (spi_global_register,
+ (GCallback) remove_object, cache);
-static void
-spi_cache_dispose (GObject * object)
-{
-
SpiCache *cache = SPI_CACHE (object
);
+ g_signal_handlers_disconnect_by_func (G_OBJECT (spi_global_app_data->root),
+ (GCallback) toplevel_added_listener, NULL);
+
+
atk_remove_global_event_listener (cache->child_added_listener
);
- G_OBJECT_CLASS (spi_cache_parent_class)->
dispos
e (object);
+ G_OBJECT_CLASS (spi_cache_parent_class)->
finaliz
e (object);
}
/*---------------------------------------------------------------------------*/
}
/*---------------------------------------------------------------------------*/
@@
-171,6
+167,10
@@
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 if (g_queue_remove (cache->add_traversal, gobj))
+ {
+ g_object_unref (gobj);
+ }
}
static void
}
static void
@@
-191,9
+191,10
@@
add_object (SpiCache * cache, GObject * gobj)
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
-static GStaticRecMutex cache_mutex = G_STATIC_REC_MUTEX_INIT;
-static GStaticMutex recursion_check_guard = G_STATIC_MUTEX_INIT;
+static GRecMutex cache_mutex;
+#ifdef SPI_ATK_DEBUG
+static GStaticMutex recursion_check_guard = G_STATIC_MUTEX_INIT;
static gboolean recursion_check = FALSE;
static gboolean
static gboolean recursion_check = FALSE;
static gboolean
@@
-214,6
+215,7
@@
recursion_check_unset ()
recursion_check = FALSE;
g_static_mutex_unlock (&recursion_check_guard);
}
recursion_check = FALSE;
g_static_mutex_unlock (&recursion_check_guard);
}
+#endif /* SPI_ATK_DEBUG */
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
@@
-267,21
+269,30
@@
add_pending_items (gpointer data)
while (!g_queue_is_empty (cache->add_traversal))
{
AtkStateSet *set;
while (!g_queue_is_empty (cache->add_traversal))
{
AtkStateSet *set;
-
+
+ /* cache->add_traversal holds a ref to current */
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))
{
{
+ /* transfer the ref into to_add */
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)) &&
- !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);
}
}
{
append_children (current, cache->add_traversal);
}
}
+ else
+ {
+ /* drop the ref for the removed object */
+ g_object_unref (current);
+ }
- g_object_unref (set);
+ if (set)
+ g_object_unref (set);
}
while (!g_queue_is_empty (to_add))
}
while (!g_queue_is_empty (to_add))
@@
-309,13
+320,11
@@
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;
-
AtkObject *accessible;
AtkObject *accessible;
- AtkObject *child;
const gchar *detail = NULL;
const gchar *detail = NULL;
- g_
static_
rec_mutex_lock (&cache_mutex);
+ g_rec_mutex_lock (&cache_mutex);
/*
* Ensure that only accessibles already in the cache
/*
* Ensure that only accessibles already in the cache
@@
-338,13
+347,13
@@
child_added_listener (GSignalInvocationHint * signal_hint,
if (detail && !strncmp (detail, "add", 3))
{
gpointer child;
if (detail && !strncmp (detail, "add", 3))
{
gpointer child;
- int index = g_value_get_uint (param_values + 1);
child = g_value_get_pointer (param_values + 2);
child = g_value_get_pointer (param_values + 2);
+ if (!child)
+ {
+ g_rec_mutex_unlock (&cache_mutex);
+ return TRUE;
+ }
- if (!ATK_IS_OBJECT (child))
- {
- child = atk_object_ref_accessible_child (accessible, index);
- }
g_object_ref (child);
g_queue_push_tail (cache->add_traversal, child);
g_object_ref (child);
g_queue_push_tail (cache->add_traversal, child);
@@
-356,7
+365,7
@@
child_added_listener (GSignalInvocationHint * signal_hint,
#endif
}
#endif
}
- g_
static_
rec_mutex_unlock (&cache_mutex);
+ g_rec_mutex_unlock (&cache_mutex);
return TRUE;
}
return TRUE;
}
@@
-369,7
+378,7
@@
toplevel_added_listener (AtkObject * accessible,
{
SpiCache *cache = spi_global_cache;
{
SpiCache *cache = spi_global_cache;
- g_
static_
rec_mutex_lock (&cache_mutex);
+ g_rec_mutex_lock (&cache_mutex);
g_return_if_fail (ATK_IS_OBJECT (accessible));
g_return_if_fail (ATK_IS_OBJECT (accessible));
@@
-397,7
+406,7
@@
toplevel_added_listener (AtkObject * accessible,
#endif
}
#endif
}
- g_
static_
rec_mutex_unlock (&cache_mutex);
+ g_rec_mutex_unlock (&cache_mutex);
}
/*---------------------------------------------------------------------------*/
}
/*---------------------------------------------------------------------------*/
@@
-411,6
+420,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,