Merge lp:~rodrigo-moya/unity/accessible-name-for-indicators into lp:unity

[Rodrigo Moya]

Use the accessible name from the entries to set the name for PanelIndicatorAccessible class

[Alejandro Piñeiro (apinheiro)]

The code seems ok.

review: Approve

[Mirco Müller (macslow)]

A paranoia-check against NULL for l->data before IndicatorObjectEntry *entry = (IndicatorObjectEntry *) l->data; would be nice. Apart form that approved.

review: Approve

=== modified file 'services/CMakeLists.txt'
--- services/CMakeLists.txt	2011-02-23 17:22:58 +0000
+++ services/CMakeLists.txt	2011-02-28 11:26:42 +0000
@@ -2,7 +2,7 @@
 # Panel Service
 #
 find_package(PkgConfig)
-pkg_check_modules(SERVICE_DEPS REQUIRED gobject-2.0 gio-2.0 gtk+-2.0 gthread-2.0 indicator x11 gconf-2.0)
+pkg_check_modules(SERVICE_DEPS REQUIRED gobject-2.0 gio-2.0 gtk+-2.0 gthread-2.0 indicator>=0.3.19 x11 gconf-2.0)
 
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator --variable indicatordir OUTPUT_VARIABLE _indicatordir OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator --variable iconsdir OUTPUT_VARIABLE _iconsdir OUTPUT_STRIP_TRAILING_WHITESPACE)
 
=== modified file 'services/panel-indicator-accessible.c'
--- services/panel-indicator-accessible.c	2011-02-15 12:51:44 +0000
+++ services/panel-indicator-accessible.c	2011-02-28 11:26:42 +0000
@@ -147,7 +147,6 @@
   ATK_OBJECT_CLASS (panel_indicator_accessible_parent_class)->initialize (accessible, data);
 
   pia = PANEL_INDICATOR_ACCESSIBLE (accessible);
-  atk_object_set_name (accessible, _("An indicator")); /* FIXME */
   atk_object_set_role (accessible, ATK_ROLE_PANEL);
 
   /* Setup the indicator object */
@@ -162,8 +161,9 @@
   for (l = entries; l != NULL; l = l->next)
     {
       AtkObject *accessible;
+      IndicatorObjectEntry *entry = (IndicatorObjectEntry *) l->data;
 
-      accessible = panel_indicator_entry_accessible_new ((IndicatorObjectEntry *) l->data);
+      accessible = panel_indicator_entry_accessible_new (entry);
       pia->priv->a11y_children = g_slist_append (pia->priv->a11y_children, accessible);
     }
 
 
=== modified file 'services/panel-indicator-entry-accessible.c'
--- services/panel-indicator-entry-accessible.c	2011-02-15 12:51:44 +0000
+++ services/panel-indicator-entry-accessible.c	2011-02-28 11:26:42 +0000
@@ -92,11 +92,18 @@
   if (GTK_IS_LABEL (piea->priv->entry->label))
     {
       atk_object_set_role (accessible, ATK_ROLE_LABEL);
-      atk_object_set_name (accessible, gtk_label_get_text (piea->priv->entry->label));
+      atk_object_set_name (accessible,
+			   piea->priv->entry->accessible_desc ? 
+			   piea->priv->entry->accessible_desc :
+			   gtk_label_get_text (piea->priv->entry->label));
     }
   if (GTK_IS_IMAGE (piea->priv->entry->image))
     {
       atk_object_set_role (accessible, ATK_ROLE_IMAGE);
+      if (piea->priv->entry->accessible_desc != NULL)
+        {
+ 	  atk_object_set_name (accessible, piea->priv->entry->accessible_desc);
+	}
     }
 }