diff options
author | Emmanuele Bassi <ebassi@gmail.com> | 2021-01-12 11:36:52 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gmail.com> | 2021-01-12 11:36:52 +0000 |
commit | ff341243947ef98e87aa26d18d9e9ddcdd2b6b60 (patch) | |
tree | 14896047d879803ee3ad0b996111c8d35e611c40 | |
parent | d939d04885321564efe57580532fe53493a7feb2 (diff) | |
parent | 03b60a2d5e40da1b137117aba05a2c818edd09b3 (diff) | |
download | gtk+-ff341243947ef98e87aa26d18d9e9ddcdd2b6b60.tar.gz |
Merge branch 'ebassi/atspi-path-sanitize' into 'master'
a11y: Sanitize the AT-SPI object path further
See merge request GNOME/gtk!3071
-rw-r--r-- | gtk/a11y/gtkatspiroot.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gtk/a11y/gtkatspiroot.c b/gtk/a11y/gtkatspiroot.c index 48c9e60676..6aa1048841 100644 --- a/gtk/a11y/gtkatspiroot.c +++ b/gtk/a11y/gtkatspiroot.c @@ -667,8 +667,16 @@ gtk_at_spi_root_constructed (GObject *gobject) { const char *program_name = g_get_prgname (); + char *base_name = NULL; + if (program_name == NULL || *program_name == 0) + base_name = g_strdup ("unknown"); + else if (*program_name == '/') + base_name = g_path_get_basename (program_name); + else + base_name = g_strdup (program_name); + self->base_path = g_strconcat ("/org/gtk/application/", - program_name != NULL ? program_name : "unknown", + base_name, "/a11y", NULL); |