Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

atspi: Use name and description as provided

Browse Source 
GtkATContext already does fallbacks to derive values
for these, so no need for the atspi implementation to
do its own fallback on top of that.
This commit is contained in:
Matthias Clasen
2020-10-19 14:57:43 -04:00
parent 08ae513064
commit 77d1026c5a
1 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/a11y/gtkatspicontext.c
View File

@@ -592,29 +592,14 @@ handle_accessible_get_property (GDBusConnection *connection,
if (g_strcmp0 (property_name, "Name") == 0)
{
if (GTK_IS_WIDGET (accessible))
res = g_variant_new_string (gtk_widget_get_name (GTK_WIDGET (accessible)));
else if (GTK_IS_STACK_PAGE (accessible))
{
const char *name = gtk_stack_page_get_name (GTK_STACK_PAGE (accessible));
if (name == NULL)
name = G_OBJECT_TYPE_NAME (accessible);
res = g_variant_new_string (name);
}
else
res = g_variant_new_string (G_OBJECT_TYPE_NAME (accessible));
char *label = gtk_at_context_get_name (GTK_AT_CONTEXT (self));
res = g_variant_new_string (label ? label : "");
g_free (label);
}
else if (g_strcmp0 (property_name, "Description") == 0)
{
char *label = gtk_at_context_get_description (GTK_AT_CONTEXT (self));
if (label == NULL || *label == '\0')
{
g_free (label);
label = gtk_at_context_get_name (GTK_AT_CONTEXT (self));
}
res = g_variant_new_string (label);
res = g_variant_new_string (label ? label : "");
g_free (label);
}
else if (g_strcmp0 (property_name, "Locale") == 0)