Merge lp:~themuso/unity/keep-copy-of-session-button-label into lp:unity

[Luke Yelavich]

Make a copy of a session button plain text label

Similar to the fix for quicklist menu items, keep a copy of the session
button label for a11y use to allow for the buttons in the session dialog
to be spoken by Orca.

Make a copy of a quicklist menu item plain text label

Similar to the fix for quicklist menu items, keep a copy of the session
button label for a11y use to allow for the buttons in the session dialog
to be spoken by Orca.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4000
http://jenkins.qa.ubuntu.com/job/unity-ci/1294/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/70
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/70/console

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

review: Needs Fixing (continuous-integration)

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

Thanks.

review: Approve

=== modified file 'plugins/unityshell/src/unity-session-button-accessible.cpp'
--- plugins/unityshell/src/unity-session-button-accessible.cpp	2014-02-25 01:07:06 +0000
+++ plugins/unityshell/src/unity-session-button-accessible.cpp	2015-09-14 02:11:45 +0000
@@ -65,6 +65,15 @@
                         G_IMPLEMENT_INTERFACE(ATK_TYPE_ACTION,
                                               atk_action_interface_init))
 
+#define UNITY_SESSION_BUTTON_ACCESSIBLE_GET_PRIVATE(obj)           \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UNITY_TYPE_SESSION_BUTTON_ACCESSIBLE, \
+                                UnitySessionButtonAccessiblePrivate))
+
+struct _UnitySessionButtonAccessiblePrivate
+{
+  gchar *name;
+};
+
 static void
 unity_session_button_accessible_class_init(UnitySessionButtonAccessibleClass* klass)
 {
@@ -78,16 +87,30 @@
   atk_class->initialize = unity_session_button_accessible_initialize;
   atk_class->get_name = unity_session_button_accessible_get_name;
   atk_class->ref_state_set = unity_session_button_accessible_ref_state_set;
+
+  g_type_class_add_private(gobject_class, sizeof(UnitySessionButtonAccessiblePrivate));
 }
 
 static void
 unity_session_button_accessible_init(UnitySessionButtonAccessible* session_button_accessible)
 {
+  UnitySessionButtonAccessiblePrivate *priv =
+    UNITY_SESSION_BUTTON_ACCESSIBLE_GET_PRIVATE(session_button_accessible);
+
+  session_button_accessible->priv = priv;
+  session_button_accessible->priv->name = NULL;
 }
 
 static void
 unity_session_button_accessible_dispose(GObject* object)
 {
+  UnitySessionButtonAccessible *self = UNITY_SESSION_BUTTON_ACCESSIBLE(object);
+
+  if (self->priv->name != NULL) {
+    g_free(self->priv->name);
+    self->priv->name = NULL;
+  }
+
   G_OBJECT_CLASS(unity_session_button_accessible_parent_class)->dispose(object);
 }
 
@@ -139,24 +162,30 @@
 static const gchar*
 unity_session_button_accessible_get_name(AtkObject* obj)
 {
-  const gchar* name;
-
   g_return_val_if_fail(UNITY_IS_SESSION_BUTTON_ACCESSIBLE(obj), NULL);
 
-  name = ATK_OBJECT_CLASS(unity_session_button_accessible_parent_class)->get_name(obj);
-  if (name == NULL)
+  UnitySessionButtonAccessible *self = UNITY_SESSION_BUTTON_ACCESSIBLE(obj);
+
+  if (self->priv->name)
+  {
+    g_free(self->priv->name);
+    self->priv->name = NULL;
+  }
+
+  self->priv->name = g_strdup(ATK_OBJECT_CLASS(unity_session_button_accessible_parent_class)->get_name(obj));
+  if (self->priv->name == NULL)
   {
     Button* button = NULL;
 
     button = dynamic_cast<Button*>(nux_object_accessible_get_object(NUX_OBJECT_ACCESSIBLE(obj)));
 
     if (button == NULL) /* State is defunct */
-      name = NULL;
+      self->priv->name = NULL;
     else
-      name = button->label().c_str();
+      self->priv->name = g_strdup(button->label().c_str());
   }
 
-  return name;
+  return self->priv->name;
 }
 
 static AtkStateSet*

=== modified file 'plugins/unityshell/src/unity-session-button-accessible.h'
--- plugins/unityshell/src/unity-session-button-accessible.h	2014-02-25 01:07:06 +0000
+++ plugins/unityshell/src/unity-session-button-accessible.h	2015-09-14 02:11:45 +0000
@@ -34,10 +34,13 @@
 
 typedef struct _UnitySessionButtonAccessible        UnitySessionButtonAccessible;
 typedef struct _UnitySessionButtonAccessibleClass   UnitySessionButtonAccessibleClass;
+typedef struct _UnitySessionButtonAccessiblePrivate UnitySessionButtonAccessiblePrivate;
 
 struct _UnitySessionButtonAccessible
 {
   NuxObjectAccessible parent;
+
+  UnitySessionButtonAccessiblePrivate *priv;
 };
 
 struct _UnitySessionButtonAccessibleClass