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

[Rodrigo Moya]

Resurrect this branch to fix bug #715295 ("expose panel home button as the only child for the panel in unity". This adds ATK support for the PanelView and PanelHomeButton classes, which need to be exposed on a "mini-panel" object, given the rest of the contents in the panel (i.e. indicators) are exposed in the panel service process, which doesn't have access to the PanelView and PanelHomeButton objects in unity.

[Alejandro Piñeiro (apinheiro)]

21 + NUX_DECLARE_OBJECT_TYPE (Launcher, nux::TextureArea);

You mean NUX_DECLARE_OBJECT_TYPE (PanelHomeButton, nux::TextureArea)?

46 + NUX_DECLARE_OBJECT_TYPE (LauncherIcon, nux::View);

You mean NUX_DECLARE_OBJECT_TYPE (PanelView, nux::View) ?

69 /**
70 - * SECTION:nux-view-accessible
71 - * @Title: NuxViewAccessible
72 + * SECTION:unity-launcher-accessible
73 + * @Title: UnityLauncherAccessible
74 * @short_description: Implementation of the ATK interfaces for #Launcher
75 * @see_also: Launcher
76 *
77 - * #NuxViewAccessible implements the required ATK interfaces for
78 + * #UnityLauncherAccessible implements the required ATK interfaces for
79 * #Launcher, ie: exposing the different LauncherIcon on the model as
80 * #child of the object.

I would prefer to fix this launcher related task in a launcher related merge. But not a big deal anyway.

149 + atk_class->get_n_children = unity_panel_home_button_accessible_get_n_children;
150 + atk_class->ref_child = unity_panel_home_button_accessible_ref_child;

I don't understand why you provide a dummy implementation for these methods. AFAIK, the home button will not have any child, but probably I'm wrong. What missed object(s) will be the children of the panel home button?

For the same, I wouldn't include those changes on root-accessible and util-accessible here (they add noise here)

357 + atk_object_set_name (accessible, _("Panel"));

This is a useless name, taking into account that the role is ATK_ROLE_PANEL

review: Needs Fixing

[Alejandro Piñeiro (apinheiro)]

BTW, one of the interfaces that fits here is AtkAction, as it is a button. Something like actions "press", "release", "click", although probably it would be good to implement that on other bug/merge

[Rodrigo Moya (rodrigo-moya)]

> 21 + NUX_DECLARE_OBJECT_TYPE (Launcher, nux::TextureArea);
>
> You mean NUX_DECLARE_OBJECT_TYPE (PanelHomeButton, nux::TextureArea)?
>
> 46 + NUX_DECLARE_OBJECT_TYPE (LauncherIcon, nux::View);
>
> You mean NUX_DECLARE_OBJECT_TYPE (PanelView, nux::View) ?
>
right, C&P problem, fixed now

>
> 69 /**
> 70 - * SECTION:nux-view-accessible
> 71 - * @Title: NuxViewAccessible
> 72 + * SECTION:unity-launcher-accessible
> 73 + * @Title: UnityLauncherAccessible
> 74 * @short_description: Implementation of the ATK interfaces for
> #Launcher
> 75 * @see_also: Launcher
> 76 *
> 77 - * #NuxViewAccessible implements the required ATK interfaces for
> 78 + * #UnityLauncherAccessible implements the required ATK interfaces
> for
> 79 * #Launcher, ie: exposing the different LauncherIcon on the model as
> 80 * #child of the object.
>
> I would prefer to fix this launcher related task in a launcher related merge.
> But not a big deal anyway.
>
yes, might make sense in a launcher branch, but not a big deal, as you said.

> 149 + atk_class->get_n_children =
> unity_panel_home_button_accessible_get_n_children;
> 150 + atk_class->ref_child = unity_panel_home_button_accessible_ref_child;
>
> I don't understand why you provide a dummy implementation for these methods.
> AFAIK, the home button will not have any child, but probably I'm wrong. What
> missed object(s) will be the children of the panel home button?
>
no children for the home button. I added the 2 methods because I thought it was going to return the NuxViewAccessible children, but that's not the case, so removed those 2 methods

> For the same, I wouldn't include those changes on root-accessible and util-
> accessible here (they add noise here)
>
> 357 + atk_object_set_name (accessible, _("Panel"));
>
> This is a useless name, taking into account that the role is ATK_ROLE_PANEL
>
ok, changed it to "Unity Panel", is that ok?

[Alejandro Piñeiro (apinheiro)]

Code seems OK, and I have just tested it.

review: Approve

=== modified file 'src/PanelHomeButton.cpp'
--- src/PanelHomeButton.cpp	2011-02-02 23:14:25 +0000
+++ src/PanelHomeButton.cpp	2011-02-14 16:44:32 +0000
@@ -35,6 +35,8 @@
 #define PANEL_HEIGHT 24
 #define BUTTON_WIDTH 66
 
+NUX_IMPLEMENT_OBJECT_TYPE (PanelHomeButton);
+
 PanelHomeButton::PanelHomeButton ()
 : TextureArea (NUX_TRACKER_LOCATION),
   _util_cg (CAIRO_FORMAT_ARGB32, BUTTON_WIDTH, PANEL_HEIGHT)

=== modified file 'src/PanelHomeButton.h'
--- src/PanelHomeButton.h	2011-02-02 23:14:25 +0000
+++ src/PanelHomeButton.h	2011-02-14 16:44:32 +0000
@@ -29,6 +29,7 @@
 
 class PanelHomeButton : public nux::TextureArea, public Introspectable
 {
+  NUX_DECLARE_OBJECT_TYPE (PanelHomeButton, nux::TextureArea);
 public:
   PanelHomeButton ();
   ~PanelHomeButton ();

=== modified file 'src/PanelView.cpp'
--- src/PanelView.cpp	2011-01-20 17:32:47 +0000
+++ src/PanelView.cpp	2011-02-14 16:44:32 +0000
@@ -36,6 +36,8 @@
 #include "IndicatorObjectFactoryRemote.h"
 #include "PanelIndicatorObjectView.h"
 
+NUX_IMPLEMENT_OBJECT_TYPE (PanelView);
+
 PanelView::PanelView (NUX_FILE_LINE_DECL)
 :   View (NUX_FILE_LINE_PARAM)
 {

=== modified file 'src/PanelView.h'
--- src/PanelView.h	2010-12-17 14:07:11 +0000
+++ src/PanelView.h	2011-02-14 16:44:32 +0000
@@ -31,6 +31,7 @@
 
 class PanelView : public Introspectable, public nux::View
 {
+  NUX_DECLARE_OBJECT_TYPE (PanelView, nux::View);
 public:
   PanelView (NUX_FILE_LINE_PROTO);
   ~PanelView ();

=== modified file 'src/WindowButtons.h'
--- src/WindowButtons.h	2010-12-17 08:14:30 +0000
+++ src/WindowButtons.h	2011-02-14 16:44:32 +0000
@@ -19,6 +19,7 @@
 #ifndef WINDOW_BUTTONS_H
 #define WINDOW_BUTTONS_H
 
+#include <Nux/HLayout.h>
 #include <Nux/View.h>
 
 #include "Introspectable.h"

=== modified file 'src/unity-launcher-accessible.cpp'
--- src/unity-launcher-accessible.cpp	2011-01-13 01:59:18 +0000
+++ src/unity-launcher-accessible.cpp	2011-02-14 16:44:32 +0000
@@ -17,12 +17,12 @@
  */
 
 /**
- * SECTION:nux-view-accessible
- * @Title: NuxViewAccessible
+ * SECTION:unity-launcher-accessible
+ * @Title: UnityLauncherAccessible
  * @short_description: Implementation of the ATK interfaces for #Launcher
  * @see_also: Launcher
  *
- * #NuxViewAccessible implements the required ATK interfaces for
+ * #UnityLauncherAccessible implements the required ATK interfaces for
  * #Launcher, ie: exposing the different LauncherIcon on the model as
  * #child of the object.
  *

=== added file 'src/unity-panel-home-button-accessible.cpp'
--- src/unity-panel-home-button-accessible.cpp	1970-01-01 00:00:00 +0000
+++ src/unity-panel-home-button-accessible.cpp	2011-02-14 16:44:32 +0000
@@ -0,0 +1,92 @@
+/*
+ * 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]>
+ */
+
+/**
+ * SECTION:unity-panel-home-button-accessible
+ * @Title: UnityPanelHomeButtonAccessible
+ * @short_description: Implementation of the ATK interfaces for #PanelHomeButton
+ * @see_also: PanelHomeButton
+ *
+ * #UnityPanelHomeButtonAccessible implements the required ATK interfaces for
+ * #PanelHomeButton.
+ *
+ */
+
+#include <glib/gi18n-lib.h>
+#include <Nux/Nux.h>
+#include "PanelHomeButton.h"
+#include "unity-panel-home-button-accessible.h"
+
+#include "unitya11y.h"
+
+/* GObject */
+static void unity_panel_home_button_accessible_class_init (UnityPanelHomeButtonAccessibleClass *klass);
+static void unity_panel_home_button_accessible_init       (UnityPanelHomeButtonAccessible *self);
+
+/* AtkObject */
+static void       unity_panel_home_button_accessible_initialize     (AtkObject *accessible, gpointer data);
+
+#define UNITY_PANEL_HOME_BUTTON_ACCESSIBLE_GET_PRIVATE(obj)                      \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UNITY_TYPE_PANEL_HOME_BUTTON_ACCESSIBLE, UnityPanelHomeButtonAccessiblePrivate))
+
+G_DEFINE_TYPE (UnityPanelHomeButtonAccessible, unity_panel_home_button_accessible,  NUX_TYPE_VIEW_ACCESSIBLE)
+
+struct _UnityPanelHomeButtonAccessiblePrivate
+{
+};
+
+static void
+unity_panel_home_button_accessible_class_init (UnityPanelHomeButtonAccessibleClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
+
+  /* AtkObject */
+  atk_class->initialize = unity_panel_home_button_accessible_initialize;
+
+  g_type_class_add_private (gobject_class, sizeof (UnityPanelHomeButtonAccessiblePrivate));
+}
+
+static void
+unity_panel_home_button_accessible_init (UnityPanelHomeButtonAccessible *self)
+{
+  self->priv = UNITY_PANEL_HOME_BUTTON_ACCESSIBLE_GET_PRIVATE (self);
+}
+
+AtkObject *
+unity_panel_home_button_accessible_new (nux::Object *object)
+{
+  AtkObject *accessible;
+
+  g_return_val_if_fail (dynamic_cast<PanelHomeButton *>(object), NULL);
+
+  accessible = ATK_OBJECT (g_object_new (UNITY_TYPE_PANEL_HOME_BUTTON_ACCESSIBLE, NULL));
+
+  atk_object_initialize (accessible, object);
+
+  return accessible;
+}
+
+static void
+unity_panel_home_button_accessible_initialize (AtkObject *accessible, gpointer data)
+{
+  ATK_OBJECT_CLASS (unity_panel_home_button_accessible_parent_class)->initialize (accessible, data);
+
+  accessible->role = ATK_ROLE_PUSH_BUTTON;
+  atk_object_set_name (accessible, _("Home Button"));
+}

=== added file 'src/unity-panel-home-button-accessible.h'
--- src/unity-panel-home-button-accessible.h	1970-01-01 00:00:00 +0000
+++ src/unity-panel-home-button-accessible.h	2011-02-14 16:44:32 +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 UNITY_PANEL_HOME_BUTTON_ACCESSIBLE_H
+#define UNITY_PANEL_HOME_BUTTON_ACCESSIBLE_H
+
+#include <atk/atk.h>
+
+#include "nux-view-accessible.h"
+
+G_BEGIN_DECLS
+
+#define UNITY_TYPE_PANEL_HOME_BUTTON_ACCESSIBLE            (unity_panel_home_button_accessible_get_type ())
+#define UNITY_PANEL_HOME_BUTTON_ACCESSIBLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), UNITY_TYPE_PANEL_HOME_BUTTON_ACCESSIBLE, UnityPanelHomeButtonAccessible))
+#define UNITY_PANEL_HOME_BUTTON_ACCESSIBLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), UNITY_TYPE_PANEL_HOME_BUTTON_ACCESSIBLE, UnityPanelHomeButtonAccessibleClass))
+#define UNITY_IS_PANEL_HOME_BUTTON_ACCESSIBLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UNITY_TYPE_PANEL_HOME_BUTTON_ACCESSIBLE))
+#define UNITY_IS_PANEL_HOME_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UNITY_TYPE_PANEL_HOME_BUTTON_ACCESSIBLE))
+#define UNITY_PANEL_HOME_BUTTON_ACCESSIBLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), UNITY_TYPE_PANEL_HOME_BUTTON_ACCESSIBLE, UnityPanelHomeButtonAccessibleClass))
+
+typedef struct _UnityPanelHomeButtonAccessible        UnityPanelHomeButtonAccessible;
+typedef struct _UnityPanelHomeButtonAccessibleClass   UnityPanelHomeButtonAccessibleClass;
+typedef struct _UnityPanelHomeButtonAccessiblePrivate UnityPanelHomeButtonAccessiblePrivate;
+
+struct _UnityPanelHomeButtonAccessible
+{
+  NuxViewAccessible parent;
+
+  /* < private > */
+  UnityPanelHomeButtonAccessiblePrivate *priv;
+};
+
+struct _UnityPanelHomeButtonAccessibleClass
+{
+  NuxViewAccessibleClass parent_class;
+};
+
+GType      unity_panel_home_button_accessible_get_type (void);
+AtkObject *unity_panel_home_button_accessible_new      (nux::Object *object);
+
+G_END_DECLS
+
+#endif

=== added file 'src/unity-panel-view-accessible.cpp'
--- src/unity-panel-view-accessible.cpp	1970-01-01 00:00:00 +0000
+++ src/unity-panel-view-accessible.cpp	2011-02-14 16:44:32 +0000
@@ -0,0 +1,145 @@
+/*
+ * 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]>
+ */
+
+/**
+ * SECTION:unity-panel-view-accessible
+ * @Title: UnityPanelViewAccessible
+ * @short_description: Implementation of the ATK interfaces for #PanelView
+ * @see_also: PanelView
+ *
+ * #UnityPanelViewAccessible implements the required ATK interfaces for
+ * #PanelView, ie: exposing the different items contained in the panel
+ * as children.
+ *
+ */
+
+#include <glib/gi18n-lib.h>
+#include <Nux/Nux.h>
+#include "PanelView.h"
+#include "unity-panel-view-accessible.h"
+
+#include "unitya11y.h"
+
+/* GObject */
+static void unity_panel_view_accessible_class_init (UnityPanelViewAccessibleClass *klass);
+static void unity_panel_view_accessible_init       (UnityPanelViewAccessible *self);
+
+/* AtkObject */
+static void         unity_panel_view_accessible_initialize     (AtkObject *accessible, gpointer data);
+static gint         unity_panel_view_accessible_get_n_children (AtkObject *accessible);
+static AtkObject   *unity_panel_view_accessible_ref_child      (AtkObject *accessible, gint i);
+
+#define UNITY_PANEL_VIEW_ACCESSIBLE_GET_PRIVATE(obj)                      \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UNITY_TYPE_PANEL_VIEW_ACCESSIBLE, UnityPanelViewAccessiblePrivate))
+
+G_DEFINE_TYPE (UnityPanelViewAccessible, unity_panel_view_accessible,  NUX_TYPE_VIEW_ACCESSIBLE)
+
+struct _UnityPanelViewAccessiblePrivate
+{
+};
+
+static void
+unity_panel_view_accessible_class_init (UnityPanelViewAccessibleClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
+
+  /* AtkObject */
+  atk_class->initialize = unity_panel_view_accessible_initialize;
+  atk_class->get_n_children = unity_panel_view_accessible_get_n_children;
+  atk_class->ref_child = unity_panel_view_accessible_ref_child;
+
+  g_type_class_add_private (gobject_class, sizeof (UnityPanelViewAccessiblePrivate));
+}
+
+static void
+unity_panel_view_accessible_init (UnityPanelViewAccessible *self)
+{
+  self->priv = UNITY_PANEL_VIEW_ACCESSIBLE_GET_PRIVATE (self);
+}
+
+AtkObject *
+unity_panel_view_accessible_new (nux::Object *object)
+{
+  AtkObject *accessible;
+
+  g_return_val_if_fail (dynamic_cast<PanelView *>(object), NULL);
+
+  accessible = ATK_OBJECT (g_object_new (UNITY_TYPE_PANEL_VIEW_ACCESSIBLE, NULL));
+
+  atk_object_initialize (accessible, object);
+
+  return accessible;
+}
+
+static void
+unity_panel_view_accessible_initialize (AtkObject *accessible, gpointer data)
+{
+  ATK_OBJECT_CLASS (unity_panel_view_accessible_parent_class)->initialize (accessible, data);
+
+  accessible->role = ATK_ROLE_PANEL;
+}
+
+static gint
+unity_panel_view_accessible_get_n_children (AtkObject *accessible)
+{
+  nux::Object *nux_object = NULL;
+  PanelView *panel;
+  PanelHomeButton *home_button;
+  gint rc = 0;
+
+  g_return_val_if_fail (UNITY_IS_PANEL_VIEW_ACCESSIBLE (accessible), 0);
+
+  nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (accessible));
+  if (!nux_object) /* state is defunct */
+    return 0;
+
+  panel = dynamic_cast<PanelView *>(nux_object);
+  if ((home_button = panel->HomeButton ()) != NULL)
+    rc = 1;
+
+  return rc;
+}
+
+static AtkObject *
+unity_panel_view_accessible_ref_child (AtkObject *accessible, gint i)
+{
+  nux::Object *nux_object = NULL;
+  PanelView *panel;
+  PanelHomeButton *home_button;
+  AtkObject *child_accessible = NULL;
+
+  g_return_val_if_fail (UNITY_IS_PANEL_VIEW_ACCESSIBLE (accessible), NULL);
+
+  nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (accessible));
+  if (!nux_object) /* state is defunct */
+    return NULL;
+
+  panel = dynamic_cast<PanelView *>(nux_object);
+  if ((home_button = panel->HomeButton ()) != NULL)
+    {
+      nux::Object *child = NULL;
+
+      child = dynamic_cast<nux::Object *>(home_button);
+      child_accessible = unity_a11y_get_accessible (child);
+      if (child_accessible != NULL)
+        g_object_ref (child_accessible);
+    }
+
+  return child_accessible;
+}

=== added file 'src/unity-panel-view-accessible.h'
--- src/unity-panel-view-accessible.h	1970-01-01 00:00:00 +0000
+++ src/unity-panel-view-accessible.h	2011-02-14 16:44:32 +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 UNITY_PANEL_VIEW_ACCESSIBLE_H
+#define UNITY_PANEL_VIEW_ACCESSIBLE_H
+
+#include <atk/atk.h>
+
+#include "nux-view-accessible.h"
+
+G_BEGIN_DECLS
+
+#define UNITY_TYPE_PANEL_VIEW_ACCESSIBLE            (unity_panel_view_accessible_get_type ())
+#define UNITY_PANEL_VIEW_ACCESSIBLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), UNITY_TYPE_PANEL_VIEW_ACCESSIBLE, UnityPanelViewAccessible))
+#define UNITY_PANEL_VIEW_ACCESSIBLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), UNITY_TYPE_PANEL_VIEW_ACCESSIBLE, UnityPanelViewAccessibleClass))
+#define UNITY_IS_PANEL_VIEW_ACCESSIBLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UNITY_TYPE_PANEL_VIEW_ACCESSIBLE))
+#define UNITY_IS_PANEL_VIEW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UNITY_TYPE_PANEL_VIEW_ACCESSIBLE))
+#define UNITY_PANEL_VIEW_ACCESSIBLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), UNITY_TYPE_PANEL_VIEW_ACCESSIBLE, UnityPanelViewAccessibleClass))
+
+typedef struct _UnityPanelViewAccessible        UnityPanelViewAccessible;
+typedef struct _UnityPanelViewAccessibleClass   UnityPanelViewAccessibleClass;
+typedef struct _UnityPanelViewAccessiblePrivate UnityPanelViewAccessiblePrivate;
+
+struct _UnityPanelViewAccessible
+{
+  NuxViewAccessible parent;
+
+  /* < private > */
+  UnityPanelViewAccessiblePrivate *priv;
+};
+
+struct _UnityPanelViewAccessibleClass
+{
+  NuxViewAccessibleClass parent_class;
+};
+
+GType      unity_panel_view_accessible_get_type (void);
+AtkObject *unity_panel_view_accessible_new      (nux::Object *object);
+
+G_END_DECLS
+
+#endif

=== modified file 'src/unity-util-accessible.cpp'
--- src/unity-util-accessible.cpp	2011-01-26 19:46:30 +0000
+++ src/unity-util-accessible.cpp	2011-02-14 16:44:32 +0000
@@ -109,27 +109,27 @@
 
   type = g_type_from_name (object_type);
   if (type)
-  {
-    signal_id = g_signal_lookup (signal_name, type);
-    if (signal_id > 0)
     {
-      UnityUtilListenerInfo *listener_info;
-
-      rc = listener_idx;
-      listener_info = g_new0 (UnityUtilListenerInfo, 1);
-      listener_info->idx = listener_idx;
-      listener_info->hook_id = g_signal_add_emission_hook (signal_id, 0, listener,
-							   g_strdup (hook_data),
-							   (GDestroyNotify) g_free);
-      listener_info->signal_id = signal_id;
-
-      g_hash_table_insert (listener_list, &(listener_info->idx), listener_info);
-
-      listener_idx++;
+      signal_id = g_signal_lookup (signal_name, type);
+      if (signal_id > 0)
+        {
+          UnityUtilListenerInfo *listener_info;
+
+	  rc = listener_idx;
+	  listener_info = g_new0 (UnityUtilListenerInfo, 1);
+	  listener_info->idx = listener_idx;
+	  listener_info->hook_id = g_signal_add_emission_hook (signal_id, 0, listener,
+							       g_strdup (hook_data),
+							       (GDestroyNotify) g_free);
+	  listener_info->signal_id = signal_id;
+
+	  g_hash_table_insert (listener_list, &(listener_info->idx), listener_info);
+
+	  listener_idx++;
+	}
+      else
+        g_debug ("Signal type %s not supported\n", signal_name);
     }
-    else
-      g_debug ("Signal type %s not supported\n", signal_name);
-  }
   else
     g_warning ("Invalid object type %s\n", object_type);
 
@@ -145,19 +145,19 @@
 
   split_string = g_strsplit (event_type, ":", 3);
   if (split_string)
-  {
-    if (g_str_equal ("window", split_string[0]))
-    {
-      /* FIXME: need to specifically process window: events (create, destroy,
-	 minimize, maximize, restore, activate, deactivate) */
-    }
-    else
-    {
-      rc = add_listener (listener, split_string[1], split_string[2], event_type);
-    }
+    {
+      if (g_str_equal ("window", split_string[0]))
+        {
+	  /* FIXME: need to specifically process window: events (create, destroy,
+	     minimize, maximize, restore, activate, deactivate) */
+	}
+      else
+        {
+          rc = add_listener (listener, split_string[1], split_string[2], event_type);
+	}
 
-    g_strfreev (split_string);
-  }
+      g_strfreev (split_string);
+    }
 
   return rc;
 }
@@ -166,27 +166,27 @@
 unity_util_accessible_remove_global_event_listener (guint remove_listener)
 {
   if (remove_listener > 0)
-  {
-    UnityUtilListenerInfo *listener_info;
+    {
+      UnityUtilListenerInfo *listener_info;
 
-    listener_info = (UnityUtilListenerInfo *) g_hash_table_lookup (listener_list, &remove_listener);
-    if (listener_info != NULL)
-    {
-      if (listener_info->hook_id != 0 && listener_info->signal_id != 0)
-      {
-        g_signal_remove_emission_hook (listener_info->signal_id,
-				       listener_info->hook_id);
-	g_hash_table_remove (listener_list, &remove_listener);
-      }
+      listener_info = (UnityUtilListenerInfo *) g_hash_table_lookup (listener_list, &remove_listener);
+      if (listener_info != NULL)
+        {
+	  if (listener_info->hook_id != 0 && listener_info->signal_id != 0)
+            {
+	      g_signal_remove_emission_hook (listener_info->signal_id,
+					     listener_info->hook_id);
+	      g_hash_table_remove (listener_list, &remove_listener);
+	    }
+	  else
+	    {
+              g_warning ("Invalid listener hook_id %ld or signal_id %d",
+			 listener_info->hook_id, listener_info->signal_id);
+	    }
+	}
       else
-      {
-        g_warning ("Invalid listener hook_id %ld or signal_id %d",
-		   listener_info->hook_id, listener_info->signal_id);
-      }
+        g_warning ("No listener with the specified ID: %d", remove_listener);
     }
-    else
-      g_warning ("No listener with the specified ID: %d", remove_listener);
-  }
   else
     g_warning ("Invalid listener_id: %d", remove_listener);
 }

=== modified file 'src/unitya11y.cpp'
--- src/unitya11y.cpp	2011-01-31 13:38:14 +0000
+++ src/unitya11y.cpp	2011-02-14 16:44:32 +0000
@@ -32,8 +32,11 @@
 /* unity accessible objects */
 #include "Launcher.h"
 #include "LauncherIcon.h"
+#include "PanelView.h"
 #include "unity-launcher-accessible.h"
 #include "unity-launcher-icon-accessible.h"
+#include "unity-panel-view-accessible.h"
+#include "unity-panel-home-button-accessible.h"
 
 static GHashTable *accessible_table = NULL;
 /* FIXME: remove accessible objects when not required anymore */
@@ -243,6 +246,12 @@
   if (object->Type().IsDerivedFromType (LauncherIcon::StaticObjectType))
     return unity_launcher_icon_accessible_new (object);
 
+  if (object->Type().IsDerivedFromType (PanelView::StaticObjectType))
+    return unity_panel_view_accessible_new (object);
+
+  if (object->Type().IsDerivedFromType (PanelHomeButton::StaticObjectType))
+    return unity_panel_home_button_accessible_new (object);
+
   /* NUX classes  */
   if (object->Type().IsDerivedFromType (nux::BaseWindow::StaticObjectType))
     return nux_base_window_accessible_new (object);

=== modified file 'src/unityshell.cpp'
--- src/unityshell.cpp	2011-02-13 00:46:10 +0000
+++ src/unityshell.cpp	2011-02-14 16:44:32 +0000
@@ -636,6 +636,12 @@
   self->panelWindow->ShowWindow(true);
   self->panelWindow->EnableInputWindow(true, "panel");
   self->panelWindow->InputWindowEnableStruts(true);
+
+  /* FIXME: this should not be manual, should be managed with a
+     show/hide callback like in GAIL*/
+  if (unity_a11y_initialized () == TRUE)
+    unity_util_accessible_add_window (self->panelWindow);
+
   LOGGER_END_PROCESS ("initLauncher-Panel");
 
   /* Setup Places */