2009-08-12 Mark Doffman <mark.doffman@codethink.co.uk>

[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / accessible-register.c

diff --git a/atk-adaptor/accessible-register.c b/atk-adaptor/accessible-register.c
index c6c7328..901b8aa 100644 (file)
--- a/atk-adaptor/accessible-register.c
+++ b/atk-adaptor/accessible-register.c
@@ -135,8 +135,8 @@ object_to_ref (AtkObject *accessible)
 /*
  * Converts the Accessible object reference to its D-Bus object path
  */
-static gchar *
-ref_to_path (guint ref)
+gchar *
+atk_dbus_ref_to_path (guint ref)
 {
   return g_strdup_printf(SPI_ATK_OBJECT_REFERENCE_TEMPLATE, ref);
 }
@@ -158,6 +158,7 @@ deregister_accessible (gpointer data, GObject *accessible)
   ref = object_to_ref (ATK_OBJECT(accessible));
   if (ref != 0)
     {
+      spi_emit_cache_removal (ref, atk_adaptor_app_data->bus);
       g_hash_table_remove(ref2ptr, GINT_TO_POINTER(ref));
     }
 }
@@ -236,20 +237,21 @@ append_children (AtkObject *accessible, GQueue *traversal)
 {
   AtkObject *current;
   guint i;
+  gint count = atk_object_get_n_accessible_children (accessible);
 
-  for (i =0; i < atk_object_get_n_accessible_children (accessible); i++)
+  if (count < 0) count = 0;
+  for (i =0; i < count; i++)
     {
       current = atk_object_ref_accessible_child (accessible, i);
+      if (current)
+        {
 #ifdef SPI_ATK_DEBUG
-      non_owned_accessible (current);
+          non_owned_accessible (current);
 #endif
-      if (!has_manages_descendants (current))
-        {
-          g_queue_push_tail (traversal, current);
-        }
-      else
-        {
-          g_object_unref (G_OBJECT (current));
+          if (!has_manages_descendants (current))
+              g_queue_push_tail (traversal, current);
+          else
+              g_object_unref (G_OBJECT (current));
         }
     }
 }
@@ -363,6 +365,63 @@ atk_dbus_path_to_object (const char *path)
 }
 
 /*
+ * TODO WARNING HACK This function is dangerous.
+ * It should only be called before sending an event on an
+ * object that has not already been registered.
+ */
+gchar *
+atk_dbus_object_attempt_registration (AtkObject *accessible)
+{
+  guint ref;
+
+  ref = object_to_ref (accessible);
+  if (!ref)
+    {
+      /* See if the object is attached to the main tree */
+      AtkObject *current, *prev = NULL;
+      guint cref = 0;
+
+      /* This should iterate until it hits a NULL or registered parent */
+      prev = accessible;
+      current = atk_object_get_parent (accessible);
+      if (current)
+          cref = object_to_ref (current);
+      while (current && !cref)
+        {
+          prev = current;
+          current = atk_object_get_parent (current);
+          if (current)
+              cref = object_to_ref (current);
+        }
+
+      /* A registered parent, with non-registered child, has been found */
+      if (current)
+        {
+          register_subtree (prev);
+        }
+
+      /* The object SHOULD be registered now. If it isn't - I give up */
+      ref = object_to_ref (accessible);
+      if (ref)
+        {
+          return atk_dbus_ref_to_path (ref);
+        }
+      else
+        {
+#ifdef SPI_ATK_DEBUG
+          g_debug ("AT-SPI: Could not register a non-attached accessible object");
+#endif
+          return NULL;
+        }
+    }
+  else
+    {
+      return atk_dbus_ref_to_path (ref);
+    }
+}
+
+
+/*
  * Used to lookup a D-Bus path from the AtkObject.
  */
 gchar *
@@ -374,7 +433,7 @@ atk_dbus_object_to_path (AtkObject *accessible)
   if (!ref)
       return NULL;
   else
-      return ref_to_path (ref);
+      return atk_dbus_ref_to_path (ref);
 }
 
 gchar *
@@ -444,6 +503,7 @@ tree_update_state_action (GSignalInvocationHint *signal_hint,
                           AtkObject             *accessible)
 {
       update_accessible (accessible);
+  return TRUE;
 }
 
 static gboolean
@@ -453,6 +513,7 @@ tree_update_state_listener (GSignalInvocationHint *signal_hint,
                             gpointer               data)
 {
       tree_update_wrapper (signal_hint, n_param_values, param_values, data, tree_update_state_action);
+  return TRUE;
 }
 
 static gboolean
@@ -474,6 +535,7 @@ tree_update_property_action (GSignalInvocationHint *signal_hint,
           update_accessible (accessible);
         }
       /* Parent value us updated by child-add signal of parent object */
+      return TRUE;
 }
 
 static gboolean
@@ -482,7 +544,8 @@ tree_update_property_listener (GSignalInvocationHint *signal_hint,
                                const GValue          *param_values,
                                gpointer               data)
 {
-      tree_update_wrapper (signal_hint, n_param_values, param_values, data, tree_update_property_action);
+  tree_update_wrapper (signal_hint, n_param_values, param_values, data, tree_update_property_action);
+  return TRUE;
 }
 
 static gboolean
@@ -495,6 +558,7 @@ tree_update_children_action (GSignalInvocationHint *signal_hint,
       const gchar *detail = NULL;
       AtkObject *child;
 
+      if (has_manages_descendants (accessible)) return TRUE;
       if (signal_hint->detail)
           detail = g_quark_to_string (signal_hint->detail);
 
@@ -514,6 +578,7 @@ tree_update_children_action (GSignalInvocationHint *signal_hint,
           register_subtree (child);
           update_accessible (accessible);
         }
+      return TRUE;
 }
 
 static gboolean
@@ -523,6 +588,7 @@ tree_update_children_listener (GSignalInvocationHint *signal_hint,
                                gpointer               data)
 {
       tree_update_wrapper (signal_hint, n_param_values, param_values, data, tree_update_children_action);
+      return TRUE;
 }
 
 /*---------------------------------------------------------------------------*/