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
be247e4
..
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",
@@
-154,14
+150,6
@@
spi_cache_finalize (GObject * object)
G_OBJECT_CLASS (spi_cache_parent_class)->finalize (object);
}
G_OBJECT_CLASS (spi_cache_parent_class)->finalize (object);
}
-static void
-spi_cache_dispose (GObject * object)
-{
- SpiCache *cache = SPI_CACHE (object);
-
- G_OBJECT_CLASS (spi_cache_parent_class)->dispose (object);
-}
-
/*---------------------------------------------------------------------------*/
static void
/*---------------------------------------------------------------------------*/
static void
@@
-203,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
@@
-226,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 */
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
@@
-334,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
@@
-357,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);
@@
-376,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;
}
@@
-389,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));
@@
-417,7
+406,7
@@
toplevel_added_listener (AtkObject * accessible,
#endif
}
#endif
}
- g_
static_
rec_mutex_unlock (&cache_mutex);
+ g_rec_mutex_unlock (&cache_mutex);
}
/*---------------------------------------------------------------------------*/
}
/*---------------------------------------------------------------------------*/