From 13ca9a89915c4a06806d5f46bf304e2952848bd2 Mon Sep 17 00:00:00 2001 From: Luke Yelavich Date: Fri, 17 Feb 2012 15:01:53 +1100 Subject: Do not set the accessible name to an empty string if the accessible_desc property = NULL. Yes this was recently changed so that dbusmenu conformed to Atk documentation, but the GTK menu item accessibility code does not yet conform to sed documentation. As a result, all dbusmenu menu items that do not have the accessible_desc property set end up getting an empty string for their accessible name. In the long term, GTK accessibility needs to be fixed. --- libdbusmenu-gtk/client.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'libdbusmenu-gtk') diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 830356a..1883eea 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -741,10 +741,6 @@ process_a11y_desc (DbusmenuMenuitem * mi, GtkMenuItem * gmi, GVariant * variant, setname = g_variant_get_string(variant, NULL); } - if (setname == NULL) { - setname = ""; - } - atk_object_set_name(aobj, setname); return; } -- cgit v1.2.3 From 6d953d231b4d974d1c79e604e88b55c13499433d Mon Sep 17 00:00:00 2001 From: Luke Yelavich Date: Thu, 8 Mar 2012 16:15:06 +1100 Subject: Set the accessible name from the dbusmenu item label. THis is a work-around until GTK follows atk docs. --- libdbusmenu-gtk/client.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'libdbusmenu-gtk') diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 1883eea..4c3f1c2 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -741,6 +741,14 @@ process_a11y_desc (DbusmenuMenuitem * mi, GtkMenuItem * gmi, GVariant * variant, setname = g_variant_get_string(variant, NULL); } + /* The atk docs advise to set the name of the atk object to an empty + * string, but GTK doesn't yet do the same, and setting the name to NULL + * causes tests to fail. + */ + if (setname == NULL) { + setname = dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_LABEL); + } + atk_object_set_name(aobj, setname); return; } -- cgit v1.2.3