AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 22:41:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'ebassi/for-master' into 'master'

Browse Source 
Ebassi/for master

See merge request GNOME/gtk!2876
This commit is contained in:
Emmanuele Bassi 2020-11-23 15:41:03 +00:00
commit d7de720275
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/a11y/gtkatspicontext.c
View File

@ -1598,7 +1598,7 @@ get_bus_address_dbus (GdkDisplay *display)
if (error != NULL)
{
g_critical ("Unable to acquire session bus: %s", error->message);
GTK_NOTE (A11Y, g_message ("Unable to acquire session bus: %s", error->message));
g_error_free (error);
return NULL;
}
@ -1615,8 +1615,8 @@ get_bus_address_dbus (GdkDisplay *display)
&error);
if (error != NULL)
{
g_critical ("Unable to acquire the address of the accessibility bus: %s",
error->message);
GTK_NOTE (A11Y, g_message ("Unable to acquire the address of the accessibility bus: %s",
error->message));
g_error_free (error);
}
@ -1711,9 +1711,17 @@ gtk_at_spi_create_context (GtkAccessibleRole accessible_role,
g_return_val_if_fail (GTK_IS_ACCESSIBLE (accessible), NULL);
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
const char *bus_address = get_bus_address (display);
static const char *bus_address;
if (bus_address == NULL)
{
bus_address = get_bus_address (display);
if (bus_address == NULL)
bus_address = "";
}
if (*bus_address == '\0')
return NULL;
#if defined(GDK_WINDOWING_WAYLAND)