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 12bcfac..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_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",
@@ -109,7 +105,6 @@ static void spi_cache_class_init (SpiCacheClass * klass)
 static void
 spi_cache_init (SpiCache * cache)
 {
-g_print("dbg: init cache\n");
   cache->objects = g_hash_table_new (g_direct_hash, g_direct_equal);
   cache->add_traversal = g_queue_new ();
 
@@ -155,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
@@ -180,8 +167,10 @@ 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
-    g_queue_remove (cache->add_traversal, gobj);
+  else if (g_queue_remove (cache->add_traversal, gobj))
+    {
+      g_object_unref (gobj);
+    }
 }
 
 static void
@@ -202,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
@@ -225,6 +215,7 @@ recursion_check_unset ()
   recursion_check = FALSE;
   g_static_mutex_unlock (&recursion_check_guard);
 }
+#endif /* SPI_ATK_DEBUG */
 
 /*---------------------------------------------------------------------------*/
 
@@ -278,12 +269,14 @@ add_pending_items (gpointer data)
   while (!g_queue_is_empty (cache->add_traversal))
     {
       AtkStateSet *set;
-      
+
+      /* cache->add_traversal holds a ref to current */
       current = g_queue_pop_head (cache->add_traversal);
       set = atk_object_ref_state_set (current);
 
       if (set && !atk_state_set_contains_state (set, ATK_STATE_TRANSIENT))
         {
+          /* transfer the ref into to_add */
          g_queue_push_tail (to_add, current);
           if (!spi_cache_in (cache, G_OBJECT (current)) &&
               !atk_state_set_contains_state  (set, ATK_STATE_MANAGES_DESCENDANTS) &&
@@ -292,6 +285,11 @@ add_pending_items (gpointer data)
               append_children (current, cache->add_traversal);
             }
         }
+      else
+        {
+          /* drop the ref for the removed object */
+          g_object_unref (current);
+        }
 
       if (set)
         g_object_unref (set);
@@ -326,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
@@ -349,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);
@@ -368,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;
 }
@@ -381,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));
 
@@ -409,7 +406,7 @@ toplevel_added_listener (AtkObject * accessible,
 #endif
     }
 
-  g_static_rec_mutex_unlock (&cache_mutex);
+  g_rec_mutex_unlock (&cache_mutex);
 }
 
 /*---------------------------------------------------------------------------*/