Merge lp:~themuso/unity/keep-own-copy-of-quicklist-menu-item-label into lp:unity

[Luke Yelavich]

Make a copy of a quicklist menu item plain text label

Likely due to changes in the gcc transition, Orca stopped speaking quicklist menu items. It seems that keeping a separate copy of the label string for a11y use allows quicklist menu items to be spoken again.

Make a copy of a quicklist menu item plain text label

Likely due to changes in the gcc transition, Orca stopped speaking quicklist menu items. It seems that keeping a separate copy of the label string for a11y use allows quicklist menu items to be spoken again.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4001
http://jenkins.qa.ubuntu.com/job/unity-ci/1293/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/69/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1293/rebuild

review: Needs Fixing (continuous-integration)

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

+1

review: Approve

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

Ouch no.. Approved wrong branch.

There 's a FTB here due to a missing bracket (see inline comment).

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

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4002
http://jenkins.qa.ubuntu.com/job/unity-ci/1300/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/78/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/76
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/76/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1300/rebuild

review: Needs Fixing (continuous-integration)

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

Thanks.

review: Approve

=== modified file 'plugins/unityshell/src/unity-quicklist-menu-item-accessible.cpp'
--- plugins/unityshell/src/unity-quicklist-menu-item-accessible.cpp	2014-02-13 10:24:52 +0000
+++ plugins/unityshell/src/unity-quicklist-menu-item-accessible.cpp	2015-09-21 00:21:42 +0000
@@ -65,6 +65,8 @@
 
   guint on_parent_selection_change_id;
   guint on_parent_change_id;
+
+  gchar *name;
 };
 
 using unity::QuicklistMenuItem;
@@ -94,6 +96,7 @@
     UNITY_QUICKLIST_MENU_ITEM_ACCESSIBLE_GET_PRIVATE(self);
 
   self->priv = priv;
+  self->priv->name = NULL;
 }
 
 static void
@@ -113,6 +116,12 @@
   if (self->priv->on_parent_change_id != 0)
     g_signal_handler_disconnect(object, self->priv->on_parent_change_id);
 
+  if (self->priv->name != NULL)
+  {
+    g_free(self->priv->name);
+    self->priv->name = NULL;
+  }
+
   G_OBJECT_CLASS(unity_quicklist_menu_item_accessible_parent_class)->dispose(object);
 }
 
@@ -198,23 +207,28 @@
 static const gchar*
 unity_quicklist_menu_item_accessible_get_name(AtkObject* obj)
 {
-  const gchar* name = NULL;
-
   g_return_val_if_fail(UNITY_IS_QUICKLIST_MENU_ITEM_ACCESSIBLE(obj), NULL);
-
-  name = ATK_OBJECT_CLASS(unity_quicklist_menu_item_accessible_parent_class)->get_name(obj);
-  if (name == NULL)
+  UnityQuicklistMenuItemAccessible *self = UNITY_QUICKLIST_MENU_ITEM_ACCESSIBLE(obj);
+
+  if (self->priv->name)
+  {
+    g_free(self->priv->name);
+    self->priv->name = NULL;
+  }
+
+  self->priv->name = g_strdup(ATK_OBJECT_CLASS(unity_quicklist_menu_item_accessible_parent_class)->get_name(obj));
+  if (self->priv->name == NULL)
   {
     QuicklistMenuItem* menu_item = NULL;
 
     menu_item = dynamic_cast<QuicklistMenuItem*>(nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(obj)));
     if (menu_item != NULL)
     {
-      name = menu_item->GetPlainTextLabel().c_str();
+      self->priv->name = g_strdup(menu_item->GetPlainTextLabel().c_str());
     }
   }
 
-  return name;
+  return self->priv->name;
 }
 
 static AtkStateSet*