Merge lp:~apinheiro/unity/atk-selection into lp:unity

[Alejandro Piñeiro]

This branch solves the problems with all the related bugs. All three were too tied to create three different branches, so I concluded that it was better to just work on a branch.

Anyway, I have a problem. I was not able to test it. On a normal run, it crashes when the launcher icon accessible object tries to connect to the new signal that I added to the Launcher. This is weird, as it works on the custom unit tests that I created (on unitya11y). This is the reason I added Mirco here, to check if the signal is wrong.

Anyway, I fear that it is a known bug. Using gdb on this crash I get this backtrace:
rogram received signal SIGSEGV, Segmentation fault.
0xb76070a9 in std::_List_node_base::_M_hook(std::_List_node_base*) () from /usr/lib/libstdc++.so.6
(gdb) bt
#0 0xb76070a9 in std::_List_node_base::_M_hook(std::_List_node_base*) () from /usr/lib/libstdc++.so.6
#1 0xb76d1c4d in sigc::internal::signal_impl::insert(std::_List_iterator<sigc::slot_base>, sigc::slot_base const&) () from /usr/lib/libsigc-2.0.so.0
#2 0xb76d1ce7 in sigc::internal::signal_impl::connect(sigc::slot_base const&) () from /usr/lib/libsigc-2.0.so.0
#3 0xb76d1f78 in sigc::signal_base::connect(sigc::slot_base const&) () from /usr/lib/libsigc-2.0.so.0
#4 0xb509fd4d in connect (accessible=0x8de9920, data=0x91efd0c) at /usr/include/sigc++-2.0/sigc++/signal.h:2659
#5 unity_launcher_icon_accessible_initialize (accessible=0x8de9920, data=0x91efd0c

And this _M_hook thing is a bug already reported:

https://bugs.launchpad.net/ubuntu/+source/nux/+bug/717600

So, if I'm proposing this merge, is more a gentle request to the people: could you review my code to discard any stupid mistake in my code? Could you test (Rodrigo?) this branch to discard something specific on my environment? Thanks

[Alejandro Piñeiro (apinheiro)]

Well, finally I was able to solve that crashes. It seems that the real problem was with the casting. The last commit add more type checks, and it solves it.

I was able to test it, and also get a initial support with orca, although using this custom orca script:

https://bugzilla.gnome.org/show_bug.cgi?id=643419

For the moment it just expose the selection change on the Launcher.

So now, it is just a normal merge proposal.

[Rodrigo Moya (rodrigo-moya)]

Works as advertised

review: Approve

[Mirco Müller (macslow)]

Alejandro, what did you do to trigger the crash? Just switch to the launcher key-nav-mode with Alt-F1? I can easily use the launcher key-nav-mode here using your branch merged to trunk and don't get any crash. So I'd also approve it as I don't see a problem.

[Mirco Müller (macslow)]

Well then... approved :)

review: Approve

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-02-27 08:27:17 +0000
+++ src/Launcher.cpp	2011-02-28 12:13:08 +0000
@@ -507,6 +507,7 @@
   ubus_server_send_message (ubus_server_get_default (),
                             UBUS_LAUNCHER_END_KEY_NAV,
                             NULL);
+  selection_change.emit ();
 }
 
 void 
@@ -530,6 +531,7 @@
   ubus_server_send_message (ubus_server_get_default (),
                             UBUS_LAUNCHER_END_KEY_NAV,
                             NULL);
+  selection_change.emit ();
 }
 
 void
@@ -2642,6 +2644,7 @@
         // FIXME: switch to global-menu here still needs to be implemented 
       }
       NeedRedraw ();
+      selection_change.emit ();
     break;
 
     // down (move selection down and unfold launcher if needed)
@@ -2650,6 +2653,7 @@
       {
         _current_icon_index++;
         NeedRedraw ();
+        selection_change.emit ();
       }
     break;
 
@@ -3475,3 +3479,21 @@
   // reset our shiz
   ProcessDndLeave ();
 }
+
+
+/*
+ * Returns the current selected icon if it is in keynavmode
+ * It will return NULL if it is not on keynavmode
+ */
+LauncherIcon*
+Launcher::GetSelectedMenuIcon ()
+{
+  LauncherModel::iterator it;
+
+  if (_current_icon_index == -1)
+    return NULL;
+
+  it = _model->at (_current_icon_index);
+
+  return *it;
+}

=== modified file 'src/Launcher.h'
--- src/Launcher.h	2011-02-25 15:41:25 +0000
+++ src/Launcher.h	2011-02-28 12:13:08 +0000
@@ -101,6 +101,8 @@
   LauncherIcon* GetLastSpreadIcon() {return m_LastSpreadIcon;}
   void SetLastSpreadIcon(LauncherIcon *i) {m_LastSpreadIcon = i;}
 
+  LauncherIcon* GetSelectedMenuIcon ();
+
   void SetIconSize(int tile_size, int icon_size);
 
   void SetModel (LauncherModel *model);
@@ -153,6 +155,7 @@
 
 
   sigc::signal<void, char *, LauncherIcon *> launcher_dropped;
+  sigc::signal<void> selection_change;
 protected:
   // Introspectable methods
   const gchar* GetName ();

=== modified file 'src/LauncherIcon.h'
--- src/LauncherIcon.h	2011-02-23 23:18:44 +0000
+++ src/LauncherIcon.h	2011-02-28 12:13:08 +0000
@@ -80,6 +80,8 @@
     LauncherIcon(Launcher* launcher);
     virtual ~LauncherIcon();
 
+    Launcher* GetLauncher () {return _launcher;};
+
     void SetTooltipText (const TCHAR* text);
     
     nux::NString GetTooltipText ();

=== modified file 'src/unity-launcher-accessible.cpp'
--- src/unity-launcher-accessible.cpp	2011-02-17 12:57:17 +0000
+++ src/unity-launcher-accessible.cpp	2011-02-28 12:13:08 +0000
@@ -37,6 +37,7 @@
 /* GObject */
 static void unity_launcher_accessible_class_init (UnityLauncherAccessibleClass *klass);
 static void unity_launcher_accessible_init       (UnityLauncherAccessible *self);
+static void unity_launcher_accessible_finalize   (GObject *object);
 
 /* AtkObject.h */
 static void       unity_launcher_accessible_initialize     (AtkObject *accessible,
@@ -45,22 +46,64 @@
 static AtkObject *unity_launcher_accessible_ref_child      (AtkObject *obj,
                                                             gint i);
 
-G_DEFINE_TYPE (UnityLauncherAccessible, unity_launcher_accessible,  NUX_TYPE_VIEW_ACCESSIBLE)
+/* AtkSelection */
+static void       atk_selection_interface_init                  (AtkSelectionIface *iface);
+static AtkObject* unity_launcher_accessible_ref_selection       (AtkSelection *selection,
+                                                                 gint i);
+static gint       unity_launcher_accessible_get_selection_count (AtkSelection *selection);
+static gboolean   unity_launcher_accessible_is_child_selected   (AtkSelection *selection,
+                                                                 gint i);
+
+/* private */
+static void on_selection_change_cb (UnityLauncherAccessible *launcher_accessible);
+
+
+G_DEFINE_TYPE_WITH_CODE (UnityLauncherAccessible, unity_launcher_accessible,  NUX_TYPE_VIEW_ACCESSIBLE,
+                         G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init))
+
+#define UNITY_LAUNCHER_ACCESSIBLE_GET_PRIVATE(obj)                      \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UNITY_TYPE_LAUNCHER_ACCESSIBLE,  \
+                                UnityLauncherAccessiblePrivate))
+
+struct _UnityLauncherAccessiblePrivate
+{
+  sigc::connection on_selection_change_connection;
+};
+
 
 static void
 unity_launcher_accessible_class_init (UnityLauncherAccessibleClass *klass)
 {
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
+  gobject_class->finalize = unity_launcher_accessible_finalize;
+
   /* AtkObject */
   atk_class->get_n_children = unity_launcher_accessible_get_n_children;
   atk_class->ref_child = unity_launcher_accessible_ref_child;
   atk_class->initialize = unity_launcher_accessible_initialize;
+
+  g_type_class_add_private (gobject_class, sizeof (UnityLauncherAccessiblePrivate));
 }
 
 static void
 unity_launcher_accessible_init (UnityLauncherAccessible *self)
 {
+  UnityLauncherAccessiblePrivate *priv =
+    UNITY_LAUNCHER_ACCESSIBLE_GET_PRIVATE (self);
+
+  self->priv = priv;
+}
+
+static void
+unity_launcher_accessible_finalize (GObject *object)
+{
+  UnityLauncherAccessible *self = UNITY_LAUNCHER_ACCESSIBLE (object);
+
+  self->priv->on_selection_change_connection.disconnect ();
+
+  G_OBJECT_CLASS (unity_launcher_accessible_parent_class)->finalize (object);
 }
 
 AtkObject*
@@ -82,9 +125,21 @@
 unity_launcher_accessible_initialize (AtkObject *accessible,
                                       gpointer data)
 {
+  Launcher *launcher = NULL;
+  nux::Object *nux_object = NULL;
+  UnityLauncherAccessible *self = NULL;
+
   ATK_OBJECT_CLASS (unity_launcher_accessible_parent_class)->initialize (accessible, data);
 
   accessible->role = ATK_ROLE_TOOL_BAR;
+
+  self = UNITY_LAUNCHER_ACCESSIBLE (accessible);
+  nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (accessible));
+
+  launcher = dynamic_cast<Launcher *>(nux_object);
+
+  self->priv->on_selection_change_connection  =
+    launcher->selection_change.connect (sigc::bind (sigc::ptr_fun (on_selection_change_cb), self));
 }
 
 static gint
@@ -122,6 +177,7 @@
   nux::Object *child = NULL;
   AtkObject *child_accessible = NULL;
 
+  g_return_val_if_fail (UNITY_IS_LAUNCHER_ACCESSIBLE (obj), NULL);
   num = atk_object_get_n_accessible_children (obj);
   g_return_val_if_fail ((i < num)&&(i >= 0), NULL);
 
@@ -130,6 +186,8 @@
     return 0;
 
   launcher = dynamic_cast<Launcher *>(nux_object);
+  g_debug ("[Launcher] ref_child Launcher = %p", launcher);
+
   launcher_model = launcher->GetModel ();
 
   it = launcher_model->begin ();
@@ -142,3 +200,115 @@
 
   return child_accessible;
 }
+
+/* AtkSelection */
+static void
+atk_selection_interface_init (AtkSelectionIface *iface)
+{
+  iface->ref_selection = unity_launcher_accessible_ref_selection;
+  iface->get_selection_count = unity_launcher_accessible_get_selection_count;
+  iface->is_child_selected = unity_launcher_accessible_is_child_selected;
+
+  /* NOTE: for the moment we don't provide the implementation for the
+     "interactable" methods, it is, the methods that allow to change
+     the selected icon. The Launcher doesn't provide that API, and
+     right now  we are focusing on a normal user input.*/
+  /* iface->add_selection = unity_launcher_accessible_add_selection; */
+  /* iface->clear_selection = unity_launcher_accessible_clear_selection; */
+  /* iface->remove_selection = unity_launcher_accessible_remove_selection; */
+
+  /* This method will never be implemented, as select all the launcher
+     icons makes no sense */
+  /* iface->select_all = unity_launcher_accessible_select_all_selection; */
+}
+
+static AtkObject*
+unity_launcher_accessible_ref_selection (AtkSelection *selection,
+                                         gint i)
+{
+  Launcher *launcher = NULL;
+  LauncherIcon *selected_icon = NULL;
+  nux::Object *nux_object = NULL;
+  AtkObject *accessible_selected = NULL;
+
+  g_return_val_if_fail (UNITY_IS_LAUNCHER_ACCESSIBLE (selection), 0);
+  /* there can be only just item selected */
+  g_return_val_if_fail (i == 0, NULL);
+
+  nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (selection));
+  if (!nux_object) /* state is defunct */
+    return 0;
+
+  launcher = dynamic_cast<Launcher *>(nux_object);
+  selected_icon = launcher->GetSelectedMenuIcon ();
+
+  if (selected_icon != 0)
+    {
+      accessible_selected = unity_a11y_get_accessible (selected_icon);
+      g_object_ref (accessible_selected);
+    }
+
+  return accessible_selected;
+}
+
+static gint
+unity_launcher_accessible_get_selection_count (AtkSelection *selection)
+{
+  Launcher *launcher = NULL;
+  LauncherIcon *selected_icon = NULL;
+  nux::Object *nux_object = NULL;
+
+  g_return_val_if_fail (UNITY_IS_LAUNCHER_ACCESSIBLE (selection), 0);
+
+  nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (selection));
+  if (!nux_object) /* state is defunct */
+    return 0;
+
+  launcher = dynamic_cast<Launcher *>(nux_object);
+  selected_icon = launcher->GetSelectedMenuIcon ();
+
+  if (selected_icon == 0)
+    return 0;
+  else
+    return 1;
+}
+
+static gboolean
+unity_launcher_accessible_is_child_selected (AtkSelection *selection,
+                                             gint i)
+{
+  Launcher *launcher = NULL;
+  LauncherIcon *icon = NULL;
+  LauncherIcon *selected_icon = NULL;
+  LauncherModel *launcher_model = NULL;
+  LauncherModel::iterator it;
+  nux::Object *nux_object = NULL;
+
+  g_return_val_if_fail (UNITY_IS_LAUNCHER_ACCESSIBLE (selection), FALSE);
+
+  nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (selection));
+  if (!nux_object) /* state is defunct */
+    return 0;
+
+  launcher = dynamic_cast<Launcher *>(nux_object);
+  launcher_model = launcher->GetModel ();
+  it = launcher_model->begin ();
+  std::advance (it, i);
+  icon = dynamic_cast<LauncherIcon *>(*it);
+
+  selected_icon = launcher->GetSelectedMenuIcon ();
+
+  if (selected_icon == icon)
+    return TRUE;
+  else
+    return FALSE;
+}
+
+/* private */
+static void on_selection_change_cb (UnityLauncherAccessible *launcher_accessible)
+{
+  g_debug ("[LAUNCHER]: selection changed");
+
+  g_signal_emit_by_name (ATK_OBJECT (launcher_accessible), "selection-changed");
+}
+

=== modified file 'src/unity-launcher-accessible.h'
--- src/unity-launcher-accessible.h	2011-02-17 12:57:17 +0000
+++ src/unity-launcher-accessible.h	2011-02-28 12:13:08 +0000
@@ -34,10 +34,14 @@
 
 typedef struct _UnityLauncherAccessible        UnityLauncherAccessible;
 typedef struct _UnityLauncherAccessibleClass   UnityLauncherAccessibleClass;
+typedef struct _UnityLauncherAccessiblePrivate   UnityLauncherAccessiblePrivate;
 
 struct _UnityLauncherAccessible
 {
   NuxViewAccessible parent;
+
+  /*< private >*/
+  UnityLauncherAccessiblePrivate *priv;
 };
 
 struct _UnityLauncherAccessibleClass

=== modified file 'src/unity-launcher-icon-accessible.cpp'
--- src/unity-launcher-icon-accessible.cpp	2011-02-17 12:57:17 +0000
+++ src/unity-launcher-icon-accessible.cpp	2011-02-28 12:13:08 +0000
@@ -34,29 +34,69 @@
 /* GObject */
 static void unity_launcher_icon_accessible_class_init (UnityLauncherIconAccessibleClass *klass);
 static void unity_launcher_icon_accessible_init       (UnityLauncherIconAccessible *launcher_icon_accessible);
+static void unity_launcher_icon_accessible_finalize   (GObject *object);
+
 
 /* AtkObject.h */
 static void          unity_launcher_icon_accessible_initialize (AtkObject *accessible,
                                                                 gpointer   data);
+static AtkStateSet*  unity_launcher_icon_accessible_ref_state_set (AtkObject *obj);
 static const gchar * unity_launcher_icon_accessible_get_name   (AtkObject *obj);
 
+/* private/utility methods*/
+static void check_selected (UnityLauncherIconAccessible *self);
+static void on_selection_change_cb (UnityLauncherIconAccessible *icon_accessible);
+
 
 G_DEFINE_TYPE (UnityLauncherIconAccessible, unity_launcher_icon_accessible,  NUX_TYPE_OBJECT_ACCESSIBLE)
 
+#define UNITY_LAUNCHER_ICON_ACCESSIBLE_GET_PRIVATE(obj) \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UNITY_TYPE_LAUNCHER_ICON_ACCESSIBLE, \
+                                UnityLauncherIconAccessiblePrivate))
+
+struct _UnityLauncherIconAccessiblePrivate
+{
+  /* Cached values (used to avoid extra notifications) */
+  gboolean selected;
+
+  sigc::connection on_selection_change_connection;
+};
+
 static void
 unity_launcher_icon_accessible_class_init (UnityLauncherIconAccessibleClass *klass)
 {
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
+  gobject_class->finalize = unity_launcher_icon_accessible_finalize;
+
   /* AtkObject */
   atk_class->initialize = unity_launcher_icon_accessible_initialize;
   atk_class->get_name = unity_launcher_icon_accessible_get_name;
+  atk_class->ref_state_set = unity_launcher_icon_accessible_ref_state_set;
+
+  g_type_class_add_private (gobject_class, sizeof (UnityLauncherIconAccessiblePrivate));
 }
 
 static void
 unity_launcher_icon_accessible_init (UnityLauncherIconAccessible *launcher_icon_accessible)
 {
-}
+  UnityLauncherIconAccessiblePrivate *priv =
+    UNITY_LAUNCHER_ICON_ACCESSIBLE_GET_PRIVATE (launcher_icon_accessible);
+
+  launcher_icon_accessible->priv = priv;
+}
+
+static void
+unity_launcher_icon_accessible_finalize (GObject *object)
+{
+  UnityLauncherIconAccessible *self = UNITY_LAUNCHER_ICON_ACCESSIBLE (object);
+
+  self->priv->on_selection_change_connection.disconnect ();
+
+  G_OBJECT_CLASS (unity_launcher_icon_accessible_parent_class)->finalize (object);
+}
+
 
 AtkObject*
 unity_launcher_icon_accessible_new (nux::Object *object)
@@ -77,9 +117,30 @@
 unity_launcher_icon_accessible_initialize (AtkObject *accessible,
                                            gpointer data)
 {
+  LauncherIcon *icon = NULL;
+  Launcher *launcher = NULL;
+  UnityLauncherIconAccessible *self = NULL;
+  nux::Object *nux_object = NULL;
+
   ATK_OBJECT_CLASS (unity_launcher_icon_accessible_parent_class)->initialize (accessible, data);
+  self = UNITY_LAUNCHER_ICON_ACCESSIBLE (accessible);
 
   accessible->role = ATK_ROLE_PUSH_BUTTON;
+
+  nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (accessible));
+  icon = dynamic_cast<LauncherIcon *>(nux_object);
+  launcher = icon->GetLauncher ();
+
+  if (launcher != NULL)
+    {
+      self->priv->on_selection_change_connection =
+        launcher->selection_change.connect (sigc::bind (sigc::ptr_fun (on_selection_change_cb), self));
+    }
+
+  /* Check the cached selected state and notify the first selection.
+   * Ie: it is required to ensure a first notification
+   */
+  check_selected (UNITY_LAUNCHER_ICON_ACCESSIBLE (accessible));
 }
 
 
@@ -105,3 +166,70 @@
 
   return name;
 }
+
+static AtkStateSet*
+unity_launcher_icon_accessible_ref_state_set (AtkObject *obj)
+{
+  AtkStateSet *state_set = NULL;
+  UnityLauncherIconAccessible *self = NULL;
+  nux::Object *nux_object = NULL;
+
+  g_return_val_if_fail (UNITY_IS_LAUNCHER_ICON_ACCESSIBLE (obj), NULL);
+  self = UNITY_LAUNCHER_ICON_ACCESSIBLE (obj);
+
+  state_set = ATK_OBJECT_CLASS (unity_launcher_icon_accessible_parent_class)->ref_state_set (obj);
+
+  nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (obj));
+
+  if (nux_object == NULL) /* actor is defunct */
+    return state_set;
+
+  if (self->priv->selected)
+    atk_state_set_add_state (state_set, ATK_STATE_SELECTED);
+
+  return state_set;
+}
+
+/* private methods */
+
+/*
+ * Checks if the current item is selected, and notify a selection
+ * change if the selection has changed
+ */
+static void
+check_selected (UnityLauncherIconAccessible *self)
+{
+  LauncherIcon *icon = NULL;
+  LauncherIcon *selected_icon = NULL;
+  Launcher *launcher = NULL;
+  nux::Object *nux_object = NULL;
+  gboolean found = FALSE;
+
+  nux_object = nux_object_accessible_get_object (NUX_OBJECT_ACCESSIBLE (self));
+  icon = dynamic_cast<LauncherIcon *>(nux_object);
+  launcher = icon->GetLauncher ();
+
+  if (launcher == NULL)
+    return;
+
+  selected_icon = launcher->GetSelectedMenuIcon ();
+
+  if (icon == selected_icon)
+    found = TRUE;
+
+  if (found != self->priv->selected)
+    {
+      self->priv->selected = found;
+      atk_object_notify_state_change (ATK_OBJECT (self),
+                                      ATK_STATE_SELECTED,
+                                      found);
+      g_debug ("[LAUNCHER-ICON]: selected state changed (%p:%i)", self, found);
+    }
+}
+
+static void
+on_selection_change_cb (UnityLauncherIconAccessible *icon_accessible)
+{
+  check_selected (icon_accessible);
+}
+

=== modified file 'src/unity-launcher-icon-accessible.h'
--- src/unity-launcher-icon-accessible.h	2011-02-17 12:57:17 +0000
+++ src/unity-launcher-icon-accessible.h	2011-02-28 12:13:08 +0000
@@ -34,10 +34,14 @@
 
 typedef struct _UnityLauncherIconAccessible        UnityLauncherIconAccessible;
 typedef struct _UnityLauncherIconAccessibleClass   UnityLauncherIconAccessibleClass;
+typedef struct _UnityLauncherIconAccessiblePrivate   UnityLauncherIconAccessiblePrivate;
 
 struct _UnityLauncherIconAccessible
 {
   NuxObjectAccessible parent;
+
+  /*< private >*/
+  UnityLauncherIconAccessiblePrivate *priv;
 };
 
 struct _UnityLauncherIconAccessibleClass

=== modified file 'src/unity-root-accessible.cpp'
--- src/unity-root-accessible.cpp	2011-02-14 16:40:11 +0000
+++ src/unity-root-accessible.cpp	2011-02-28 12:13:08 +0000
@@ -118,7 +118,7 @@
   // FIXME: compiz doesn't set the program name using g_set_prgname,
   // and AFAIK, there isn't a way to get it. Requires further investigation.
   // accessible->name = g_get_prgname();
-  atk_object_set_name (accessible, "Unity");
+  atk_object_set_name (accessible, "unity");
   atk_object_set_parent (accessible, NULL);
 
   ATK_OBJECT_CLASS (unity_root_accessible_parent_class)->initialize (accessible, data);

=== modified file 'src/unitya11y.cpp'
--- src/unitya11y.cpp	2011-02-23 17:22:58 +0000
+++ src/unitya11y.cpp	2011-02-28 12:13:08 +0000
@@ -33,6 +33,7 @@
 /* unity accessible objects */
 #include "Launcher.h"
 #include "LauncherIcon.h"
+#include "SimpleLauncherIcon.h"
 #include "PanelView.h"
 #include "unity-launcher-accessible.h"
 #include "unity-launcher-icon-accessible.h"
@@ -310,6 +311,53 @@
   return TRUE;
 }
 
+/**
+ * This unit test checks if the launcher connection process works
+ */
+static gboolean
+a11y_unit_test_launcher_connection (void)
+{
+  Launcher *launcher = NULL;
+  nux::BaseWindow *window = NULL;
+  AtkObject *launcher_accessible = NULL;
+  LauncherIcon *launcher_icon = NULL;
+  AtkObject *launcher_icon_accessible = NULL;
+
+  window = new nux::BaseWindow (TEXT(""));
+  launcher = new Launcher (window, NULL);
+  launcher->SinkReference ();
+  launcher_accessible = unity_a11y_get_accessible (launcher);
+
+  if (!UNITY_IS_LAUNCHER_ACCESSIBLE (launcher_accessible))
+    {
+      g_debug ("[a11y] wrong launcher accessible type");
+      return FALSE;
+    }
+  else
+    {
+      g_debug ("[a11y] Launcher accessible created correctly");
+    }
+
+  launcher_icon = new SimpleLauncherIcon (launcher);
+  launcher_icon->SinkReference ();
+  launcher_icon_accessible = unity_a11y_get_accessible (launcher_icon);
+
+  if (!UNITY_IS_LAUNCHER_ICON_ACCESSIBLE (launcher_icon_accessible))
+    {
+      g_debug ("[a11y] wrong launcher icon accessible type");
+      return FALSE;
+    }
+  else
+    {
+      g_debug ("[a11y] LauncherIcon accessible created correctly");
+    }
+
+  launcher->UnReference ();
+  launcher_icon->UnReference ();
+
+  return TRUE;
+}
+
 void
 unity_run_a11y_unit_tests (void)
 {
@@ -322,6 +370,12 @@
     g_debug ("[a11y] hash table destroy management unit test: SUCCESS");
   else
     g_debug ("[a11y] hash table destroy management unit test: FAIL");
+
+  if (a11y_unit_test_launcher_connection ())
+    g_debug ("[a11y] launcher connection: SUCCESS");
+  else
+    g_debug ("[a11y] launcher connection: FAIL");
+
 }
 
 
@@ -370,6 +424,8 @@
     }
 
   g_free (bridge_path);
+
+  // unity_run_a11y_unit_tests ();
 }
 
 /*