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
Stop using deprecated glib functions
[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
54a1449
..
128d2eb
100644
(file)
--- a/
atk-adaptor/accessible-cache.c
+++ b/
atk-adaptor/accessible-cache.c
@@
-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 */
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
@@
-322,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
@@
-349,7
+351,7
@@
child_added_listener (GSignalInvocationHint * signal_hint,
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);
+ g_rec_mutex_unlock (&cache_mutex);
return;
}
return;
}
@@
-364,7
+366,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;
}
@@
-377,7
+379,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));
@@
-405,7
+407,7
@@
toplevel_added_listener (AtkObject * accessible,
#endif
}
#endif
}
- g_
static_
rec_mutex_unlock (&cache_mutex);
+ g_rec_mutex_unlock (&cache_mutex);
}
/*---------------------------------------------------------------------------*/
}
/*---------------------------------------------------------------------------*/