X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=atk-adaptor%2Faccessible-cache.c;h=5065a00ebb83ccce91a6b6abc8a94e542b757d97;hp=3a30b514114030bd50a60adf6a986554207c67c4;hb=305e6dd2f4b8c551108b6907de8146eb8007d657;hpb=d1e52eb847dcabf7a2be07dbd71cfcb4e0805306

diff --git a/atk-adaptor/accessible-cache.c b/atk-adaptor/accessible-cache.c
index 3a30b51..5065a00 100644
--- 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_dispose (GObject * object);
-
 /*---------------------------------------------------------------------------*/
 
 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;
-  object_class->dispose = spi_cache_dispose;
 
   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);
 }
 
-static void
-spi_cache_dispose (GObject * object)
-{
-  SpiCache *cache = SPI_CACHE (object);
-
-  G_OBJECT_CLASS (spi_cache_parent_class)->dispose (object);
-}
-
 /*---------------------------------------------------------------------------*/
 
 static void
@@ -179,9 +167,8 @@ 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);
     }
-  else
+  else if (g_queue_remove (cache->add_traversal, gobj))
     {
-      g_queue_remove (cache->add_traversal, gobj);
       g_object_unref (gobj);
     }
 }
@@ -204,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
@@ -227,6 +215,7 @@ recursion_check_unset ()
   recursion_check = FALSE;
   g_static_mutex_unlock (&recursion_check_guard);
 }
+#endif /* SPI_ATK_DEBUG */
 
 /*---------------------------------------------------------------------------*/
 
@@ -335,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
@@ -358,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);
@@ -377,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;
 }
@@ -390,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));
 
@@ -418,7 +406,7 @@ toplevel_added_listener (AtkObject * accessible,
 #endif
     }
 
-  g_static_rec_mutex_unlock (&cache_mutex);
+  g_rec_mutex_unlock (&cache_mutex);
 }
 
 /*---------------------------------------------------------------------------*/