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 54a1449..5065a00 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
@@ -214,6 +215,7 @@ recursion_check_unset ()
   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;
 
-  g_static_rec_mutex_lock (&cache_mutex);
+  g_rec_mutex_lock (&cache_mutex);
 
   /* 
    * Ensure that only accessibles already in the cache
@@ -345,12 +347,11 @@ child_added_listener (GSignalInvocationHint * signal_hint,
       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)
             {
-              g_static_rec_mutex_unlock (&cache_mutex);
-              return;
+              g_rec_mutex_unlock (&cache_mutex);
+              return TRUE;
             }
 
           g_object_ref (child);
@@ -364,7 +365,7 @@ child_added_listener (GSignalInvocationHint * signal_hint,
 #endif
     }
 
-  g_static_rec_mutex_unlock (&cache_mutex);
+  g_rec_mutex_unlock (&cache_mutex);
 
   return TRUE;
 }
@@ -377,7 +378,7 @@ toplevel_added_listener (AtkObject * accessible,
 {
   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));
 
@@ -405,7 +406,7 @@ toplevel_added_listener (AtkObject * accessible,
 #endif
     }
 
-  g_static_rec_mutex_unlock (&cache_mutex);
+  g_rec_mutex_unlock (&cache_mutex);
 }
 
 /*---------------------------------------------------------------------------*/