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
d186130
..
5065a00
100644
(file)
--- a/
atk-adaptor/accessible-cache.c
+++ b/
atk-adaptor/accessible-cache.c
@@
-191,7
+191,7
@@
add_object (SpiCache * cache, GObject * gobj)
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
-static G
StaticRecMutex cache_mutex = G_STATIC_REC_MUTEX_INIT
;
+static G
RecMutex cache_mutex
;
#ifdef SPI_ATK_DEBUG
static GStaticMutex recursion_check_guard = G_STATIC_MUTEX_INIT;
#ifdef SPI_ATK_DEBUG
static GStaticMutex recursion_check_guard = G_STATIC_MUTEX_INIT;
@@
-324,7
+324,7
@@
child_added_listener (GSignalInvocationHint * signal_hint,
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
@@
-347,12
+347,11
@@
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);
if (!child)
{
child = g_value_get_pointer (param_values + 2);
if (!child)
{
- g_
static_
rec_mutex_unlock (&cache_mutex);
- return;
+ g_rec_mutex_unlock (&cache_mutex);
+ return
TRUE
;
}
g_object_ref (child);
}
g_object_ref (child);
@@
-366,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;
}
@@
-379,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));
@@
-407,7
+406,7
@@
toplevel_added_listener (AtkObject * accessible,
#endif
}
#endif
}
- g_
static_
rec_mutex_unlock (&cache_mutex);
+ g_rec_mutex_unlock (&cache_mutex);
}
/*---------------------------------------------------------------------------*/
}
/*---------------------------------------------------------------------------*/