Merge lp:~rodrigo-moya/unity/indicators-a11y into lp:unity

[Rodrigo Moya]

Add A11Y objects hierarchy for indicators in the panel service

[Alejandro Piñeiro (apinheiro)]

250 + if (GTK_IS_LABEL (piea->priv->entry->label))
251 + {
252 + atk_object_set_role (accessible, ATK_ROLE_LABEL);
253 + atk_object_set_name (accessible, gtk_label_get_text (piea->priv->entry->label));
254 + }
255 + if (GTK_IS_IMAGE (piea->priv->entry->image))
256 + {
257 + atk_object_set_role (accessible, ATK_ROLE_IMAGE);
258 + }

Those are the only types (LABEL, IMAGE)? Is it ok if a non-image-label is set a UNKNOWN role?

133 + if (entry != NULL)
134 + child = panel_indicator_entry_accessible_new (entry);

With this code you are creating a new accessible object with each call to this method, but for the same base object you should return the same accessible object.

261 +static gint
262 +panel_indicator_entry_accessible_get_n_children (AtkObject *accessible)
263 +{
264 + PanelIndicatorEntryAccessible *piea;
265 + gint n_children = 0;
266 +
267 + g_return_val_if_fail (PANEL_IS_INDICATOR_ENTRY_ACCESSIBLE (accessible), 0);
268 +
269 + piea = PANEL_INDICATOR_ENTRY_ACCESSIBLE (accessible);
270 + if (GTK_IS_MENU (piea->priv->entry->menu)
271 + && gtk_widget_get_visible (GTK_WIDGET (piea->priv->entry->menu)))

Why do you count the menu entry only if it is visible? (this question also applies to ref_child)

393 + indicator = panel_service_get_indicator (PANEL_ROOT_ACCESSIBLE (accessible)->priv->service, i);
394 + if (indicator != NULL)
395 + {
396 + child = panel_indicator_accessible_new (indicator);
397 + atk_object_set_parent (child, accessible);

As I said before, for the same base object you should return the same accessible object, not create a new accessible object each time.

[Alejandro Piñeiro (apinheiro)]

453 --- services/panel-service.h 2010-12-23 00:33:48 +0000
454 +++ services/panel-service.h 2011-02-09 12:51:59 +0000

Why do you modify the indentation of all the methods in this header?

review: Needs Fixing

[Alejandro Piñeiro (apinheiro)]

520 === modified file 'services/panel-service.h'
521 --- services/panel-service.h 2010-12-23 00:33:48 +0000
522 +++ services/panel-service.h 2011-02-14 10:55:50 +0000

Again, you are including changes on this file, that are mostly indentation of non-a11y-related methods. Not sure if fits here.

I still didn't test it, but although all code seems ok, I miss something. When we were talking about the list of accessible object, we also said that this list should be updated with the inclusion/removal of indicators/entries. As far as I see, with this code it creates the list at the beginning, but it doesn't update it.

review: Needs Information

[Rodrigo Moya (rodrigo-moya)]

> 520 === modified file 'services/panel-service.h'
> 521 --- services/panel-service.h 2010-12-23 00:33:48 +0000
> 522 +++ services/panel-service.h 2011-02-14 10:55:50 +0000
>
> Again, you are including changes on this file, that are mostly indentation of
> non-a11y-related methods. Not sure if fits here.
>
well, I changed the indentation to follow the coding style, which is to indent all function name prototypes

> I still didn't test it, but although all code seems ok, I miss something. When
> we were talking about the list of accessible object, we also said that this
> list should be updated with the inclusion/removal of indicators/entries. As
> far as I see, with this code it creates the list at the beginning, but it
> doesn't update it.
>
as we talked, that's for another branch: bug #715300

[Alejandro Piñeiro (apinheiro)]

> > 520 === modified file 'services/panel-service.h'
> > 521 --- services/panel-service.h 2010-12-23 00:33:48 +0000
> > 522 +++ services/panel-service.h 2011-02-14 10:55:50 +0000
> >
> > Again, you are including changes on this file, that are mostly indentation
> of
> > non-a11y-related methods. Not sure if fits here.
> >
> well, I changed the indentation to follow the coding style, which is to indent
> all function name prototypes

My concern is do changes not related with accessibility on a accessibility task. I would ask the other unity developers about it.

> > I still didn't test it, but although all code seems ok, I miss something.
> When
> > we were talking about the list of accessible object, we also said that this
> > list should be updated with the inclusion/removal of indicators/entries. As
> > far as I see, with this code it creates the list at the beginning, but it
> > doesn't update it.
> >
> as we talked, that's for another branch: bug #715300

Well, I remember that you said that you were splitting your tasks in bugs, but I don't remember specifically this one.

Anyway I'm not sure about not doing this task here. Take into account that without this change this branch is simple unstable, as there are the inherent risk to access to the wrong accessible, or access to a non existing object if someone is working with the accessible (as you are also not managing ATK_STATE_DEFUNCT management). If this is ok (as unity is in development state), then go on.

review: Needs Information

[Alejandro Piñeiro (apinheiro)]

Seems ok, just some nitpicks:

83 + return (AtkObject *) pia;
287 + return (AtkObject *) piea;

why don't use the usual gobject macros ATK_OBJECT (pia)?

Anyway, then, when I tested it, I found this warning messages:

[gshell-devel]@remigio:~/a11y-scripts$ python dump_tree.py

** (process:9834): WARNING **: AT-SPI: Accessibility bus not found - Using session bus.

Index: 0
Application name: unity-panel-service
** (unity-panel-service:9294): DEBUG: PanelRootAccessible has 5 children
Application elements: 5
** (unity-panel-service:9294): DEBUG: PanelRootAccessible has 5 children

(unity-panel-service:9294): GLib-GObject-WARNING **: g_type_instance_get_private() requires a prior call to g_type_class_add_private()
** (unity-panel-service:9294): DEBUG: Returning ATK child 0x8d3a190
 -- Role: label Name: An indicator

(unity-panel-service:9294): GLib-GObject-WARNING **: g_type_instance_get_private() requires a prior call to g_type_class_add_private()
** (unity-panel-service:9294): DEBUG: Returning ATK child 0x8d3d990
 -- Role: label Name: An indicator

(unity-panel-service:9294): GLib-GObject-WARNING **: g_type_instance_get_private() requires a prior call to g_type_class_add_private()
** (unity-panel-service:9294): DEBUG: Returning ATK child 0x8bd6d18
 -- Role: label Name: An indicator

(unity-panel-service:9294): GLib-GObject-WARNING **: g_type_instance_get_private() requires a prior call to g_type_class_add_private()
** (unity-panel-service:9294): DEBUG: Returning ATK child 0x8d3a340
 -- Role: label Name: An indicator

(unity-panel-service:9294): GLib-GObject-WARNING **: g_type_instance_get_private() requires a prior call to g_type_class_add_private()
** (unity-panel-service:9294): DEBUG: Returning ATK child 0x8bd6c28
 -- Role: label Name: An indicator

I used a custom script, but I also see them using accerciser.

review: Needs Fixing

[Alejandro Piñeiro (apinheiro)]

Well after last review, and test, I think that it is worth to merge this, and refine it on the next merges.

review: Approve

=== modified file 'services/CMakeLists.txt'
--- services/CMakeLists.txt	2011-01-28 12:00:21 +0000
+++ services/CMakeLists.txt	2011-02-15 12:55:42 +0000
@@ -28,6 +28,8 @@
                panel-a11y.h
                panel-indicator-accessible.c
                panel-indicator-accessible.h
+               panel-indicator-entry-accessible.c
+               panel-indicator-entry-accessible.h
                panel-main.c
                panel-root-accessible.c
                panel-root-accessible.h

=== modified file 'services/panel-indicator-accessible.c'
--- services/panel-indicator-accessible.c	2011-01-30 17:46:02 +0000
+++ services/panel-indicator-accessible.c	2011-02-15 12:55:42 +0000
@@ -18,6 +18,7 @@
 
 #include <glib/gi18n.h>
 #include "panel-indicator-accessible.h"
+#include "panel-indicator-entry-accessible.h"
 
 G_DEFINE_TYPE(PanelIndicatorAccessible, panel_indicator_accessible, ATK_TYPE_OBJECT)
 
@@ -30,9 +31,33 @@
 
 struct _PanelIndicatorAccessiblePrivate
 {
+  IndicatorObject *indicator;
+  GSList *a11y_children;
 };
 
 static void
+panel_indicator_accessible_finalize (GObject *object)
+{
+  PanelIndicatorAccessible *pia = PANEL_INDICATOR_ACCESSIBLE (object);
+
+  if (pia->priv != NULL)
+    {
+      if (pia->priv->indicator != NULL)
+        g_object_unref (G_OBJECT (pia->priv->indicator));
+
+      while (pia->priv->a11y_children != NULL)
+        {
+	  AtkObject *accessible = ATK_OBJECT (pia->priv->a11y_children->data);
+
+	  pia->priv->a11y_children = g_slist_remove (pia->priv->a11y_children, accessible);
+	  g_object_unref (accessible);
+	}
+    }
+
+  G_OBJECT_CLASS (panel_indicator_accessible_parent_class)->finalize (object);
+}
+
+static void
 panel_indicator_accessible_class_init (PanelIndicatorAccessibleClass *klass)
 {
   GObjectClass *object_class;
@@ -40,6 +65,7 @@
 
   /* GObject */
   object_class = G_OBJECT_CLASS (klass);
+  object_class->finalize = panel_indicator_accessible_finalize;
 
   /* AtkObject */
   atk_class = ATK_OBJECT_CLASS (klass);
@@ -54,18 +80,58 @@
 panel_indicator_accessible_init (PanelIndicatorAccessible *pia)
 {
   pia->priv = GET_PRIVATE (pia);
+  pia->priv->a11y_children = NULL;
 }
 
 AtkObject *
-panel_indicator_accessible_new (void)
+panel_indicator_accessible_new (IndicatorObject *indicator)
+{
+  PanelIndicatorAccessible *pia;
+
+  pia = g_object_new (PANEL_TYPE_INDICATOR_ACCESSIBLE, NULL);
+  atk_object_initialize (ATK_OBJECT (pia), indicator);
+
+  return ATK_OBJECT (pia);
+}
+
+/* Indicator callbacks */
+
+static void
+on_indicator_entry_added (IndicatorObject *io, IndicatorObjectEntry *entry, gpointer user_data)
 {
   AtkObject *accessible;
-
-  accessible = ATK_OBJECT (g_object_new (PANEL_TYPE_INDICATOR_ACCESSIBLE, NULL));
-
-  atk_object_initialize (accessible, NULL);
-
-  return accessible;
+  PanelIndicatorAccessible *pia = PANEL_INDICATOR_ACCESSIBLE (user_data);
+
+  accessible = panel_indicator_entry_accessible_new (entry);
+  if (accessible != NULL)
+    {
+      pia->priv->a11y_children = g_slist_append (pia->priv->a11y_children, accessible);
+      g_signal_emit_by_name (ATK_OBJECT (pia), "children-changed",
+			     g_slist_length (pia->priv->a11y_children) - 1,
+			     accessible);
+    }
+}
+
+static void
+on_indicator_entry_removed (IndicatorObject *io, IndicatorObjectEntry *entry, gpointer user_data)
+{
+  GSList *l;
+  guint count = 0;
+  PanelIndicatorAccessible *pia = PANEL_INDICATOR_ACCESSIBLE (user_data);
+
+  for (l = pia->priv->a11y_children; l != NULL; l = l->next, count++)
+    {
+      AtkObject *accessible = ATK_OBJECT (l->data);
+
+      if (entry == panel_indicator_entry_accessible_get_entry (PANEL_INDICATOR_ENTRY_ACCESSIBLE (accessible)))
+        {
+	  pia->priv->a11y_children = g_slist_remove (pia->priv->a11y_children, accessible);
+	  g_signal_emit_by_name (ATK_OBJECT (pia), "children-changed",
+				 count, accessible);
+
+	  g_object_unref (accessible);
+	}
+    }
 }
 
 /* Implementation of AtkObject methods */
@@ -73,26 +139,53 @@
 static void
 panel_indicator_accessible_initialize (AtkObject *accessible, gpointer data)
 {
+  PanelIndicatorAccessible *pia;
+  GList *entries, *l;
+
   g_return_if_fail (PANEL_IS_INDICATOR_ACCESSIBLE (accessible));
 
   ATK_OBJECT_CLASS (panel_indicator_accessible_parent_class)->initialize (accessible, data);
 
+  pia = PANEL_INDICATOR_ACCESSIBLE (accessible);
   atk_object_set_name (accessible, _("An indicator")); /* FIXME */
-  atk_object_set_role (accessible, ATK_ROLE_LABEL);
+  atk_object_set_role (accessible, ATK_ROLE_PANEL);
+
+  /* Setup the indicator object */
+  pia->priv->indicator = g_object_ref (data);
+  g_signal_connect (G_OBJECT (pia->priv->indicator), "entry-added",
+		    G_CALLBACK (on_indicator_entry_added), pia);
+  g_signal_connect (G_OBJECT (pia->priv->indicator), "entry-removed",
+		    G_CALLBACK (on_indicator_entry_removed), pia);
+
+  /* Retrieve all entries and create their accessible objects */
+  entries = indicator_object_get_entries (pia->priv->indicator);
+  for (l = entries; l != NULL; l = l->next)
+    {
+      AtkObject *accessible;
+
+      accessible = panel_indicator_entry_accessible_new ((IndicatorObjectEntry *) l->data);
+      pia->priv->a11y_children = g_slist_append (pia->priv->a11y_children, accessible);
+    }
+
+  g_list_free (entries);
 }
 
 static gint
 panel_indicator_accessible_get_n_children (AtkObject *accessible)
 {
-  g_return_val_if_fail (PANEL_IS_INDICATOR_ACCESSIBLE (accessible), 0);
-
-  return 0;
+  PanelIndicatorAccessible *pia = PANEL_INDICATOR_ACCESSIBLE (accessible);
+
+  g_return_val_if_fail (PANEL_IS_INDICATOR_ACCESSIBLE (pia), 0);
+
+  return g_slist_length (pia->priv->a11y_children);
 }
 
 static AtkObject *
 panel_indicator_accessible_ref_child (AtkObject *accessible, gint i)
 {
-  g_return_val_if_fail (PANEL_IS_INDICATOR_ACCESSIBLE (accessible), NULL);
-
-  return NULL;
+  PanelIndicatorAccessible *pia = PANEL_INDICATOR_ACCESSIBLE (accessible);
+
+  g_return_val_if_fail (PANEL_IS_INDICATOR_ACCESSIBLE (pia), NULL);
+
+  return g_object_ref (g_slist_nth_data (pia->priv->a11y_children, i));
 }

=== modified file 'services/panel-indicator-accessible.h'
--- services/panel-indicator-accessible.h	2011-01-30 17:46:02 +0000
+++ services/panel-indicator-accessible.h	2011-02-15 12:55:42 +0000
@@ -20,6 +20,8 @@
 #define _PANEL_INDICATOR_ACCESSIBLE_H_
 
 #include <atk/atk.h>
+#include <libindicator/indicator.h>
+#include <libindicator/indicator-object.h>
 
 G_BEGIN_DECLS
 
@@ -46,7 +48,7 @@
 };
 
 GType      panel_indicator_accessible_get_type (void);
-AtkObject *panel_indicator_accessible_new (void);
+AtkObject *panel_indicator_accessible_new      (IndicatorObject *indicator);
 
 G_END_DECLS
 

=== added file 'services/panel-indicator-entry-accessible.c'
--- services/panel-indicator-entry-accessible.c	1970-01-01 00:00:00 +0000
+++ services/panel-indicator-entry-accessible.c	2011-02-15 12:55:42 +0000
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Rodrigo Moya <[e-mail]>
+ */
+
+#include "panel-indicator-entry-accessible.h"
+
+G_DEFINE_TYPE(PanelIndicatorEntryAccessible, panel_indicator_entry_accessible, ATK_TYPE_OBJECT)
+
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_INDICATOR_ENTRY_ACCESSIBLE, PanelIndicatorEntryAccessiblePrivate))
+
+/* AtkObject methods */
+static void       panel_indicator_entry_accessible_initialize     (AtkObject *accessible, gpointer data);
+static gint       panel_indicator_entry_accessible_get_n_children (AtkObject *accessible);
+static AtkObject *panel_indicator_entry_accessible_ref_child      (AtkObject *accessible, gint i);
+
+struct _PanelIndicatorEntryAccessiblePrivate
+{
+  IndicatorObjectEntry *entry;
+};
+
+static void
+panel_indicator_entry_accessible_class_init (PanelIndicatorEntryAccessibleClass *klass)
+{
+  GObjectClass *object_class;
+  AtkObjectClass *atk_class;
+
+  /* GObject */
+  object_class = G_OBJECT_CLASS (klass);
+
+  /* AtkObject */
+  atk_class = ATK_OBJECT_CLASS (klass);
+  atk_class->initialize = panel_indicator_entry_accessible_initialize;
+  atk_class->get_n_children = panel_indicator_entry_accessible_get_n_children;
+  atk_class->ref_child = panel_indicator_entry_accessible_ref_child;
+
+  g_type_class_add_private (object_class, sizeof (PanelIndicatorEntryAccessiblePrivate));
+}
+
+static void
+panel_indicator_entry_accessible_init (PanelIndicatorEntryAccessible *piea)
+{
+  piea->priv = GET_PRIVATE (piea);
+}
+
+AtkObject *
+panel_indicator_entry_accessible_new (IndicatorObjectEntry *entry)
+{
+  PanelIndicatorEntryAccessible *piea;
+
+  piea = g_object_new (PANEL_TYPE_INDICATOR_ENTRY_ACCESSIBLE, NULL);
+  atk_object_initialize (ATK_OBJECT (piea), entry);
+
+  return ATK_OBJECT (piea);
+}
+
+IndicatorObjectEntry *
+panel_indicator_entry_accessible_get_entry (PanelIndicatorEntryAccessible *piea)
+{
+  g_return_val_if_fail (PANEL_IS_INDICATOR_ENTRY_ACCESSIBLE (piea), NULL);
+
+  return piea->priv->entry;
+}
+
+/* Implementation of AtkObject methods */
+
+static void
+panel_indicator_entry_accessible_initialize (AtkObject *accessible, gpointer data)
+{
+  PanelIndicatorEntryAccessible *piea;
+
+  g_return_if_fail (PANEL_IS_INDICATOR_ENTRY_ACCESSIBLE (accessible));
+
+  ATK_OBJECT_CLASS (panel_indicator_entry_accessible_parent_class)->initialize (accessible, data);
+
+  piea = PANEL_INDICATOR_ENTRY_ACCESSIBLE (accessible);
+  piea->priv->entry = (IndicatorObjectEntry *) data;
+
+  if (GTK_IS_LABEL (piea->priv->entry->label))
+    {
+      atk_object_set_role (accessible, ATK_ROLE_LABEL);
+      atk_object_set_name (accessible, gtk_label_get_text (piea->priv->entry->label));
+    }
+  if (GTK_IS_IMAGE (piea->priv->entry->image))
+    {
+      atk_object_set_role (accessible, ATK_ROLE_IMAGE);
+    }
+}
+
+static gint
+panel_indicator_entry_accessible_get_n_children (AtkObject *accessible)
+{
+  PanelIndicatorEntryAccessible *piea;
+  gint n_children = 0;
+
+  g_return_val_if_fail (PANEL_IS_INDICATOR_ENTRY_ACCESSIBLE (accessible), 0);
+
+  piea = PANEL_INDICATOR_ENTRY_ACCESSIBLE (accessible);
+  if (GTK_IS_MENU (piea->priv->entry->menu))
+    n_children = 1;
+
+  return n_children;
+}
+
+static AtkObject *
+panel_indicator_entry_accessible_ref_child (AtkObject *accessible, gint i)
+{
+  PanelIndicatorEntryAccessible *piea;
+  AtkObject *child = NULL;
+
+  g_return_val_if_fail (PANEL_IS_INDICATOR_ENTRY_ACCESSIBLE (accessible), NULL);
+
+  piea = PANEL_INDICATOR_ENTRY_ACCESSIBLE (accessible);
+  if (GTK_IS_MENU (piea->priv->entry->menu))
+    child = gtk_widget_get_accessible (GTK_WIDGET (piea->priv->entry->menu));
+
+  return child;
+}

=== added file 'services/panel-indicator-entry-accessible.h'
--- services/panel-indicator-entry-accessible.h	1970-01-01 00:00:00 +0000
+++ services/panel-indicator-entry-accessible.h	2011-02-15 12:55:42 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Rodrigo Moya <[e-mail]>
+ */
+
+#ifndef _PANEL_INDICATOR_ENTRY_ACCESSIBLE_H_
+#define _PANEL_INDICATOR_ENTRY_ACCESSIBLE_H_
+
+#include <atk/atk.h>
+#include <libindicator/indicator.h>
+#include <libindicator/indicator-object.h>
+
+G_BEGIN_DECLS
+
+#define PANEL_TYPE_INDICATOR_ENTRY_ACCESSIBLE (panel_indicator_entry_accessible_get_type ())
+#define PANEL_INDICATOR_ENTRY_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PANEL_TYPE_INDICATOR_ENTRY_ACCESSIBLE, PanelIndicatorEntryAccessible))
+#define PANEL_INDICATOR_ENTRY_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANEL_TYPE_INDICATOR_ENTRY_ACCESSIBLE, PanelIndicatorEntryAccessibleClass))
+#define PANEL_IS_INDICATOR_ENTRY_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PANEL_TYPE_INDICATOR_ENTRY_ACCESSIBLE))
+#define PANEL_IS_INDICATOR_ENTRY_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANEL_TYPE_INDICATOR_ENTRY_ACCESSIBLE))
+#define PANEL_INDICATOR_ENTRY_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PANEL_TYPE_INDICATOR_ENTRY_ACCESSIBLE, PanelIndicatorEntryAccessibleClass))
+
+typedef struct _PanelIndicatorEntryAccessible        PanelIndicatorEntryAccessible;
+typedef struct _PanelIndicatorEntryAccessibleClass   PanelIndicatorEntryAccessibleClass;
+typedef struct _PanelIndicatorEntryAccessiblePrivate PanelIndicatorEntryAccessiblePrivate;
+
+struct _PanelIndicatorEntryAccessible
+{
+  AtkObject                             parent;
+  PanelIndicatorEntryAccessiblePrivate *priv;
+};
+
+struct _PanelIndicatorEntryAccessibleClass
+{
+  AtkObjectClass parent_class;
+};
+
+GType                 panel_indicator_entry_accessible_get_type (void);
+AtkObject            *panel_indicator_entry_accessible_new (IndicatorObjectEntry *entry);
+
+IndicatorObjectEntry *panel_indicator_entry_accessible_get_entry (PanelIndicatorEntryAccessible *piea);
+
+G_END_DECLS
+
+#endif

=== modified file 'services/panel-root-accessible.c'
--- services/panel-root-accessible.c	2011-01-30 17:46:02 +0000
+++ services/panel-root-accessible.c	2011-02-15 12:55:42 +0000
@@ -33,9 +33,28 @@
 
 struct _PanelRootAccessiblePrivate
 {
+  PanelService *service;
+  GSList *a11y_children;
 };
 
 static void
+panel_root_accessible_finalize (GObject *object)
+{
+  PanelRootAccessible *root = PANEL_ROOT_ACCESSIBLE (object);
+
+  if (root->priv != NULL)
+    {
+      while (root->priv->a11y_children != NULL)
+        {
+	  AtkObject *accessible = ATK_OBJECT (root->priv->a11y_children->data);
+
+	  root->priv->a11y_children = g_slist_remove (root->priv->a11y_children, accessible);
+	  g_object_unref (accessible);
+	}
+    }
+}
+
+static void
 panel_root_accessible_class_init (PanelRootAccessibleClass *klass)
 {
   GObjectClass *object_class;
@@ -43,6 +62,7 @@
 
   /* GObject */
   object_class = G_OBJECT_CLASS (klass);
+  object_class->finalize = panel_root_accessible_finalize;
 
   /* AtkObject */
   atk_class = ATK_OBJECT_CLASS (klass);
@@ -58,6 +78,8 @@
 panel_root_accessible_init (PanelRootAccessible *root)
 {
   root->priv = GET_PRIVATE (root);
+  root->priv->a11y_children = NULL;
+  root->priv->service = panel_service_get_default ();
 }
 
 AtkObject *
@@ -76,6 +98,9 @@
 static void
 panel_root_accessible_initialize (AtkObject *accessible, gpointer data)
 {
+  gint n_children, i;
+  PanelRootAccessible *root = PANEL_ROOT_ACCESSIBLE (accessible);
+
   g_return_if_fail (PANEL_IS_ROOT_ACCESSIBLE (accessible));
 
   ATK_OBJECT_CLASS (panel_root_accessible_parent_class)->initialize (accessible, data);
@@ -83,41 +108,48 @@
   accessible->role = ATK_ROLE_APPLICATION;
   atk_object_set_name (accessible, g_get_prgname ());
   atk_object_set_parent (accessible, NULL);
+
+  /* Retrieve all indicators and create their accessible objects */
+  n_children = panel_service_get_n_indicators (root->priv->service);
+  for (i = 0; i < n_children; i++)
+    {
+      IndicatorObject *indicator;
+
+      indicator = panel_service_get_indicator (root->priv->service, i);
+      if (indicator != NULL)
+        {
+	  AtkObject *accessible;
+
+	  accessible = panel_indicator_accessible_new (indicator);
+	  root->priv->a11y_children = g_slist_append (root->priv->a11y_children, accessible);
+	}
+    }
 }
 
 static gint
 panel_root_accessible_get_n_children (AtkObject *accessible)
 {
-  guint n_children;
+  PanelRootAccessible *root = PANEL_ROOT_ACCESSIBLE (accessible);
 
   g_return_val_if_fail (PANEL_IS_ROOT_ACCESSIBLE (accessible), 0);
 
-  n_children = panel_service_get_n_indicators (panel_service_get_default ());
-
-  g_debug ("PanelRootAccessible has %d children", n_children);
-
-  return n_children;
+  return g_slist_length (root->priv->a11y_children);
 }
 
 static AtkObject *
 panel_root_accessible_ref_child (AtkObject *accessible, gint i)
 {
-  AtkObject *child;
+  PanelRootAccessible *root = PANEL_ROOT_ACCESSIBLE (accessible);
 
   g_return_val_if_fail (PANEL_IS_ROOT_ACCESSIBLE (accessible), NULL);
 
-  child = panel_indicator_accessible_new (); /* FIXME */
-  atk_object_set_parent (child, accessible);
-
-  g_debug ("Returning ATK child %p", child);
-
-  return child;
+  return g_object_ref (g_slist_nth_data (root->priv->a11y_children, i));
 }
 
 static AtkObject *
 panel_root_accessible_get_parent (AtkObject *accessible)
 {
-	g_return_val_if_fail (PANEL_IS_ROOT_ACCESSIBLE (accessible), NULL);
+  g_return_val_if_fail (PANEL_IS_ROOT_ACCESSIBLE (accessible), NULL);
 
-	return NULL;
+  return NULL;
 }

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2011-01-31 20:56:29 +0000
+++ services/panel-service.c	2011-02-15 12:55:42 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Neil Jagdish Patel <[e-mail]>
+ *              Rodrigo Moya <[e-mail]>
  */
 
 #if HAVE_CONFIG_H
@@ -23,8 +24,6 @@
 #include "panel-service.h"
 
 #include <stdlib.h>
-#include <libindicator/indicator.h>
-#include <libindicator/indicator-object.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
@@ -341,6 +340,14 @@
   return g_slist_length (self->priv->indicators);
 }
 
+IndicatorObject *
+panel_service_get_indicator (PanelService *self, guint position)
+{
+  g_return_val_if_fail (PANEL_IS_SERVICE (self), NULL);
+
+  return (IndicatorObject *) g_slist_nth_data (self->priv->indicators, position);
+}
+
 /*
  * Private Methods
  */

=== modified file 'services/panel-service.h'
--- services/panel-service.h	2010-12-23 00:33:48 +0000
+++ services/panel-service.h	2011-02-15 12:55:42 +0000
@@ -20,6 +20,8 @@
 #define _PANEL_SERVICE_H_
 
 #include <glib-object.h>
+#include <libindicator/indicator.h>
+#include <libindicator/indicator-object.h>
 
 G_BEGIN_DECLS
 
@@ -64,33 +66,35 @@
   void (*_view_padding6) (void);
 };
 
-GType          panel_service_get_type      (void) G_GNUC_CONST;
-
-PanelService * panel_service_get_default   ();
-
-PanelService * panel_service_get_default_with_indicators (GList *indicators);
-
-guint          panel_service_get_n_indicators (PanelService *self);
-
-GVariant     * panel_service_sync          (PanelService *self);
-
-GVariant     * panel_service_sync_one      (PanelService *self,
-                                            const gchar  *indicator_id);
-
-void           panel_service_show_entry    (PanelService *self,
-                                            const gchar  *entry_id,
-                                            guint32       timestamp,
-                                            gint32        x,
-                                            gint32        y,
-                                            gint32        button);
-
-void           panel_service_scroll_entry   (PanelService *self,
-                                             const gchar  *entry_id,
-                                             gint32       delta);
-
-void           panel_service_get_last_xy   (PanelService  *self,
-                                            gint          *x,
-                                            gint          *y);
+GType             panel_service_get_type      (void) G_GNUC_CONST;
+
+PanelService    * panel_service_get_default   ();
+
+PanelService    * panel_service_get_default_with_indicators (GList *indicators);
+
+guint             panel_service_get_n_indicators (PanelService *self);
+
+IndicatorObject * panel_service_get_indicator (PanelService *self, guint position);
+
+GVariant        * panel_service_sync          (PanelService *self);
+
+GVariant        * panel_service_sync_one      (PanelService *self,
+					       const gchar  *indicator_id);
+
+void              panel_service_show_entry    (PanelService *self,
+					       const gchar  *entry_id,
+					       guint32       timestamp,
+					       gint32        x,
+					       gint32        y,
+					       gint32        button);
+
+void              panel_service_scroll_entry   (PanelService *self,
+						const gchar  *entry_id,
+						gint32       delta);
+
+void              panel_service_get_last_xy   (PanelService  *self,
+					       gint          *x,
+					       gint          *y);
 
 G_END_DECLS
 

=== modified file 'services/panel-util-accessible.c'
--- services/panel-util-accessible.c	2011-01-30 17:46:02 +0000
+++ services/panel-util-accessible.c	2011-02-15 12:55:42 +0000
@@ -22,7 +22,7 @@
 G_DEFINE_TYPE(PanelUtilAccessible, panel_util_accessible, ATK_TYPE_UTIL)
 
 /* AtkUtil methods */
-static AtkObject   *panel_util_accessible_get_root (void);
+static AtkObject *panel_util_accessible_get_root (void);
 
 static AtkObject *root = NULL;
 
@@ -53,7 +53,5 @@
   if (!root)
     root = panel_root_accessible_new ();
 
-  g_debug ("Returning root A11Y object at %p", root);
-
   return root;
 }