Merge lp:~azzar1/unity/fix-949448 into lp:unity

[Andrea Azzarone]

Unmute launcher.

== Problem ==
Launcher is silent to screen reader users.

== Fix ==
Fix a couple of regressions. Alan Bell confirmed the fix for the launcher.

== Test ==
Not sure how we could test it.

[Marco Trevisan (Treviño) (3v1n0)]

I only get the quicklist working here, not the launcher icons...

I think we need a manual test for this, to track eventual regressions.

review: Approve

[Andrea Azzarone (azzar1)]

Are you using the key navigation right?

[Marco Trevisan (Treviño) (3v1n0)]

Yep...

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2012-04-19 22:46:07 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2012-04-20 14:02:35 +0000
@@ -381,6 +381,7 @@
   launcher->display = display_;
   launcher->monitor = monitor;
   launcher->options = parent_->options();
+  launcher->SetModel(model_.get());
 
   nux::HLayout* layout = new nux::HLayout(NUX_TRACKER_LOCATION);
   layout->AddView(launcher, 1);
@@ -395,7 +396,6 @@
   launcher_window->InputWindowEnableStruts(false);
   launcher_window->SetEnterFocusInputArea(launcher);
 
-  launcher->SetModel(model_.get());
   launcher->launcher_addrequest.connect(sigc::mem_fun(this, &Impl::OnLauncherAddRequest));
   launcher->launcher_addrequest_special.connect(sigc::mem_fun(this, &Impl::OnLauncherAddRequestSpecial));
   launcher->launcher_removerequest.connect(sigc::mem_fun(this, &Impl::OnLauncherRemoveRequest));

=== modified file 'plugins/unityshell/src/unity-launcher-accessible.cpp'
--- plugins/unityshell/src/unity-launcher-accessible.cpp	2012-03-14 06:24:18 +0000
+++ plugins/unityshell/src/unity-launcher-accessible.cpp	2012-04-20 14:02:35 +0000
@@ -63,7 +63,7 @@
                                                               gint i);
 
 /* private */
-static void on_selection_change_cb(UnityLauncherAccessible* launcher_accessible);
+static void on_selection_change_cb(AbstractLauncherIcon::Ptr selection, UnityLauncherAccessible* launcher_accessible);
 static void on_icon_added_cb(AbstractLauncherIcon::Ptr icon, UnityLauncherAccessible* self);
 static void on_icon_removed_cb(AbstractLauncherIcon::Ptr icon, UnityLauncherAccessible* self);
 static void on_order_change_cb(UnityLauncherAccessible* self);
@@ -158,13 +158,13 @@
 
   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));
-
   model = launcher->GetModel();
 
   if (model)
   {
+    self->priv->on_selection_change_connection  =
+      model->selection_changed.connect(sigc::bind(sigc::ptr_fun(on_selection_change_cb), self));
+
     self->priv->on_icon_added_connection =
       model->icon_added.connect(sigc::bind(sigc::ptr_fun(on_icon_added_cb), self));
 
@@ -365,7 +365,7 @@
 }
 
 /* private */
-static void on_selection_change_cb(UnityLauncherAccessible* launcher_accessible)
+static void on_selection_change_cb(AbstractLauncherIcon::Ptr selection, UnityLauncherAccessible* launcher_accessible)
 {
   g_signal_emit_by_name(ATK_OBJECT(launcher_accessible), "selection-changed");
 }
@@ -386,6 +386,7 @@
     return;
 
   icon_accessible = unity_a11y_get_accessible(icon.GetPointer());
+  atk_object_set_parent(icon_accessible, ATK_OBJECT(self));
 
   update_children_index(self);
 

=== modified file 'plugins/unityshell/src/unitya11y.cpp'
--- plugins/unityshell/src/unitya11y.cpp	2012-03-14 06:24:18 +0000
+++ plugins/unityshell/src/unitya11y.cpp	2012-04-20 14:02:35 +0000
@@ -218,6 +218,9 @@
   {
     g_debug("Unity Oneiric accessibility started, using bridge on %s",
             bridge_path);
+
+    atk_get_root();
+
     a11y_initialized = TRUE;
   }