Merge lp:~themuso/indicator-applet/accessible-desc into lp:indicator-applet/0.4

[Luke Yelavich]

[lp:~themuso/indicator-applet/accessible-desc]

382. By Luke Yelavich on 2011-02-16

menuitem is already a GtkWidget

[Ted Gould (ted)]

On Mon, 2011-02-14 at 03:46 +0000, Luke Yelavich wrote:
> + /* 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);
> + }

I'm not sure why we need to update the entry here, it seems that should
be done internally in the IndicatorObject no?

  review needsinformation

review: Needs Information

[Luke Yelavich (themuso)]

On Thu, Feb 17, 2011 at 10:01:20AM EST, Ted Gould wrote:
> I'm not sure why we need to update the entry here, it seems that should
> be done internally in the IndicatorObject no?

Not all indicators have their own get_entries method, i.e messages, sound, session, me, datetime, and they don't even deal with their entry data directly, rather the get_ methods are used to retrieve that info for libindicator to fill in.

On the above understanding, I am trying to take care of the cases where indicators that have a get_entries method and do not have a get_accessible_desc method, ala indicator-application, can still get the accessible_desc variable updated.

If its better that indicator-application also be extended to have a get_accessible_desc method, then I can do that too, and that code can be changed.

Luke

[Ted Gould (ted)]

On Thu, 2011-02-17 at 00:21 +0000, Luke Yelavich wrote:
> On Thu, Feb 17, 2011 at 10:01:20AM EST, Ted Gould wrote:
> > I'm not sure why we need to update the entry here, it seems that should
> > be done internally in the IndicatorObject no?
>
> Not all indicators have their own get_entries method, i.e messages, sound, session, me, datetime, and they don't even deal with their entry data directly, rather the get_ methods are used to retrieve that info for libindicator to fill in.
>
> On the above understanding, I am trying to take care of the cases where indicators that have a get_entries method and do not have a get_accessible_desc method, ala indicator-application, can still get the accessible_desc variable updated.
>
> If its better that indicator-application also be extended to have a get_accessible_desc method, then I can do that too, and that code can be changed

=== modified file 'src/applet-main.c'
--- src/applet-main.c	2011-01-31 20:27:31 +0000
+++ src/applet-main.c	2011-02-16 00:47:11 +0000
@@ -55,6 +55,7 @@
                         				         GdkColor                  *colour,
                         				         GdkPixmap                 *pixmap,
                                          GtkWidget                 *menubar);
+static void update_accessible_desc (IndicatorObjectEntry * entry, GtkWidget * menuitem);
 
 /*************
  * main
@@ -243,6 +244,24 @@
 }
 
 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;
+}
+
+static void
 entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menubar)
 {
 	g_debug("Signal: Entry Added");
@@ -319,7 +338,12 @@
 
 	gtk_menu_shell_insert(GTK_MENU_SHELL(menubar), menuitem, position.menupos);
 
+	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, G_CALLBACK(accessible_desc_update), menuitem);
+
 	if (something_visible) {
+		if (entry->accessible_desc != NULL) {
+			update_accessible_desc(entry, menuitem);
+		}
 		gtk_widget_show(menuitem);
 	}
 	gtk_widget_set_sensitive(menuitem, something_sensitive);
@@ -443,6 +467,23 @@
 	// TODO: do something sensible here
 }
 
+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 gboolean
 load_module (const gchar * name, GtkWidget * menubar)
 {