Merge lp:~themuso/indicator-appmenu/accessible-desc into lp:indicator-appmenu/0.3

[Luke Yelavich]

[Ted Gould (ted)]

There also needs to be code in menu_prop_changed() so that when the
label changes the accessible label also gets updated.

  review needsfixing

review: Needs Fixing

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

106. By Luke Yelavich on 2011-02-16

Also update the accessible description in menu_prop_changed, although I am
not sure how we can signal a change from here.

[Luke Yelavich (themuso)]

On Thu, Feb 17, 2011 at 09:26:16AM EST, Ted Gould wrote:
> Review: Needs Fixing
> There also needs to be code in menu_prop_changed() so that when the
> label changes the accessible label also gets updated.

Ok, I updated the accessible_desc in that function, however I am not sure how I can signal a change from there, given I need a pointer to the indicator object for that indicator.

=== modified file 'src/window-menus.c'
--- src/window-menus.c	2011-02-09 19:32:08 +0000
+++ src/window-menus.c	2011-02-16 23:22:02 +0000
@@ -162,6 +162,9 @@
 		g_object_unref(entry->label);
 		entry->label = NULL;
 	}
+	if (entry->accessible_desc != NULL) {
+		entry->accessible_desc = NULL;
+	}
 	if (entry->image != NULL) {
 		g_object_unref(entry->image);
 		entry->image = NULL;
@@ -607,6 +610,8 @@
 		wmentry->disabled = !g_variant_get_boolean(value);
 	} else if (!g_strcmp0(property, DBUSMENU_MENUITEM_PROP_LABEL)) {
 		gtk_label_set_text_with_mnemonic(entry->label, g_variant_get_string(value, NULL));
+		entry->accessible_desc = g_variant_get_string(value, NULL);
+		/* FIXME: Need to signal a change in the accessible description. */
 	}
 
 	return;
@@ -634,6 +639,8 @@
 		g_object_ref(entry->label);
 	}
 
+	entry->accessible_desc = dbusmenu_menuitem_property_get(newentry, DBUSMENU_MENUITEM_PROP_LABEL);
+
 	entry->menu = dbusmenu_gtkclient_menuitem_get_submenu(priv->client, newentry);
 
 	if (entry->menu == NULL) {