static void
spi_cache_finalize (GObject * object);
-static void
-spi_cache_dispose (GObject * object);
-
/*---------------------------------------------------------------------------*/
enum
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",
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
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
/*---------------------------------------------------------------------------*/
static GStaticRecMutex cache_mutex = G_STATIC_REC_MUTEX_INIT;
-static GStaticMutex recursion_check_guard = G_STATIC_MUTEX_INIT;
+#ifdef SPI_ATK_DEBUG
+static GStaticMutex recursion_check_guard = G_STATIC_MUTEX_INIT;
static gboolean recursion_check = FALSE;
static gboolean
recursion_check = FALSE;
g_static_mutex_unlock (&recursion_check_guard);
}
+#endif /* SPI_ATK_DEBUG */
/*---------------------------------------------------------------------------*/
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) &&
append_children (current, cache->add_traversal);
}
}
+ else
+ {
+ /* drop the ref for the removed object */
+ g_object_unref (current);
+ }
if (set)
g_object_unref (set);
const GValue * param_values, gpointer data)
{
SpiCache *cache = spi_global_cache;
- gboolean child_needs_ref = TRUE;
AtkObject *accessible;
const gchar *detail = NULL;
gpointer child;
int index = g_value_get_uint (param_values + 1);
child = g_value_get_pointer (param_values + 2);
-
- if (!ATK_IS_OBJECT (child))
+ if (!child)
{
- child = atk_object_ref_accessible_child (accessible, index);
- child_needs_ref = FALSE;
+ g_static_rec_mutex_unlock (&cache_mutex);
+ return;
}
- if (child_needs_ref)
- g_object_ref (child);
+
+ g_object_ref (child);
g_queue_push_tail (cache->add_traversal, child);
if (cache->add_pending_idle == 0)
gboolean
spi_cache_in (SpiCache * cache, GObject * object)
{
+ if (!cache)
+ return FALSE;
+
if (g_hash_table_lookup_extended (cache->objects,
object,
NULL,