From 7fc90aed26b61ad752fff237303ab58a114b00c0 Mon Sep 17 00:00:00 2001 From: Mike Gorse Date: Thu, 29 Jul 2021 15:55:58 -0500 Subject: [PATCH 1/2] a11y: Send correct object reference for the root accessible --- gtk/a11y/gtkatspiroot.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gtk/a11y/gtkatspiroot.c b/gtk/a11y/gtkatspiroot.c index c25ddd5717..73ceb23f13 100644 --- a/gtk/a11y/gtkatspiroot.c +++ b/gtk/a11y/gtkatspiroot.c @@ -776,7 +776,9 @@ gtk_at_spi_root_to_ref (GtkAtSpiRoot *self) if (self->desktop_path == NULL) return gtk_at_spi_null_ref (); - return g_variant_new ("(so)", self->desktop_name, self->desktop_path); + return g_variant_new ("(so)", + g_dbus_connection_get_unique_name (self->connection), + self->root_path); } const char * From 5d7ecb7a6ec21fbb2ce83238f3f0545dfdd3219a Mon Sep 17 00:00:00 2001 From: Mike Gorse Date: Fri, 30 Jul 2021 08:58:27 -0500 Subject: [PATCH 2/2] a11y: Remove unneeded check --- gtk/a11y/gtkatspiroot.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/gtk/a11y/gtkatspiroot.c b/gtk/a11y/gtkatspiroot.c index 73ceb23f13..88a366c05f 100644 --- a/gtk/a11y/gtkatspiroot.c +++ b/gtk/a11y/gtkatspiroot.c @@ -773,9 +773,6 @@ gtk_at_spi_root_to_ref (GtkAtSpiRoot *self) { g_return_val_if_fail (GTK_IS_AT_SPI_ROOT (self), NULL); - if (self->desktop_path == NULL) - return gtk_at_spi_null_ref (); - return g_variant_new ("(so)", g_dbus_connection_get_unique_name (self->connection), self->root_path);