Merge lp:~themuso/ubiquity/indicator-accessible-desc into lp:ubiquity

[Luke Yelavich]

I can commit myself, but I'd like another pair of eyes over this. This is the same code as can be found in indicator-applet for dealing with accessible descriptions of indicators.

[Stéphane Graber (stgraber)]

It looks good but I haven't tested.

As the branch has been around for a while, I'm wondering if it's still relevant. I'll try it tomorrow.

[Luke Yelavich (themuso)]

It will be relevant once we have keyboard navigation working properly for the panel, i.e press a shortcut key and move keyboard focus to the panel. I'd like to get that sorted next cycle.

Unmerged revisions

4516. By Luke Yelavich on 2011-02-23

src/panel/panel.c: Extend indicator code to support indicator accessible
descriptions

=== modified file 'configure.ac'
--- configure.ac	2010-10-11 16:24:13 +0000
+++ configure.ac	2011-02-23 04:16:59 +0000
@@ -24,12 +24,14 @@
 AC_PROG_MAKE_SET
 
 GTK_REQUIRED=2.10.0
+ATK_REQUIRED=1.0
 AM_PATH_PYTHON([2.5])
 
 if test "x$UBIQUITY_NO_GTK" = x; then
   PKG_CHECK_MODULES(PANEL, [glib-2.0
 			  gtk+-2.0 >= $GTK_REQUIRED
 			  indicator
+			  atk >= $ATK_REQUIRED
 			  x11])
   AC_SUBST(PANEL_CFLAGS)
   AC_SUBST(PANEL_LIBS)

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-20 03:11:32 +0000
+++ debian/changelog	2011-02-23 04:16:59 +0000
@@ -1,3 +1,10 @@
+ubiquity (2.5.17) UNRELEASED; urgency=low
+
+  * src/panel/panel.c: Extend indicator code to support indicator accessible
+    descriptions
+
+ -- Luke Yelavich <[e-mail]>  Wed, 23 Feb 2011 14:39:52 +1100
+
 ubiquity (2.5.16) natty; urgency=low
 
   [ Evan Dandrea ]

=== modified file 'src/panel/panel.c'
--- src/panel/panel.c	2011-02-01 11:40:30 +0000
+++ src/panel/panel.c	2011-02-23 04:16:59 +0000
@@ -31,6 +31,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <libindicator/indicator-object.h>
+#include <atk/atk.h>
 
 #include "na-tray-manager.h"
 #include "na-tray.h"
@@ -111,6 +112,40 @@
   gdk_error_trap_pop ();
 }
 
+static void
+update_accessible_desc(IndicatorObjectEntry * entry, GtkWidget * menuitem)
+{
+        /* FIXME: We need to deal with the use case where the contents of the
+           label overrides what is found in the atk object's name, or at least
+           orca speaks the label instead of the atk object name.
+         */
+        AtkObject * menuitem_obj = gtk_widget_get_accessible(menuitem);
+        if (entry->accessible_desc != NULL) {
+                atk_object_set_name(menuitem_obj, entry->accessible_desc);
+        } else {
+                atk_object_set_name(menuitem_obj, "");
+        }
+        return;
+}
+
+static void
+accessible_desc_update (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menuitem)
+{
+    g_return_if_fail(GTK_IS_WIDGET(menuitem));
+
+    IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io);
+
+    /* Not all indicator entries have a get_accessible_desc method, such as
+       indicator-application entries */
+    if (class->get_accessible_desc != NULL) {
+            entry->accessible_desc = class->get_accessible_desc(io);
+    }
+
+    update_accessible_desc(entry, menuitem);
+
+    return;
+}
+
 /* Stolen from indicator-loader.c in unity. */
 static void
 entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data)
@@ -134,6 +169,10 @@
     }
 
     gtk_menu_shell_append(GTK_MENU_SHELL(user_data), menuitem);
+    g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, G_CALLBACK(accessible_desc_update), menuitem);
+    if (entry->accessible_desc != NULL) {
+        update_accessible_desc(entry, menuitem);
+    }
     gtk_widget_show(menuitem);
 
     g_object_set_data(G_OBJECT(menuitem), ENTRY_DATA_NAME, entry);