summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gmail.com>2021-08-20 13:18:37 +0000
committerEmmanuele Bassi <ebassi@gmail.com>2021-08-20 13:18:37 +0000
commit12c5518e2bc12a18d647fdad698c6bd6968d0ebc (patch)
treecb6c72707acb2e2d0492b8b8432cf0c6a886541b
parent36d1c9e8b7d9ab6728ea7d83af117579145591bb (diff)
parent5d7ecb7a6ec21fbb2ce83238f3f0545dfdd3219a (diff)
downloadgtk+-12c5518e2bc12a18d647fdad698c6bd6968d0ebc.tar.gz
Merge branch 'master' into 'master'
a11y: Send correct object reference for the root accessible See merge request GNOME/gtk!3800
-rw-r--r--gtk/a11y/gtkatspiroot.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk/a11y/gtkatspiroot.c b/gtk/a11y/gtkatspiroot.c
index c25ddd5717..88a366c05f 100644
--- a/gtk/a11y/gtkatspiroot.c
+++ b/gtk/a11y/gtkatspiroot.c
@@ -773,10 +773,9 @@ 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)", self->desktop_name, self->desktop_path);
+ return g_variant_new ("(so)",
+ g_dbus_connection_get_unique_name (self->connection),
+ self->root_path);
}
const char *