diff options
| author | Mike Gorse <mgorse@suse.com> | 2019-05-22 00:09:24 +0000 |
|---|---|---|
| committer | Mike Gorse <mgorse@suse.com> | 2019-05-22 00:09:24 +0000 |
| commit | 6e0e94d0f3e257f87d89e7b23ee7be5e1f0a87c6 (patch) | |
| tree | 99cf076728efcb169cad8900906e527b76b1267d /atspi | |
| parent | 92ae94873f6f5d208e0229097e0b6dcf67585806 (diff) | |
| parent | b68e60b75f4f6741da156d143c242b4a177a6434 (diff) | |
| download | at-spi2-core-6e0e94d0f3e257f87d89e7b23ee7be5e1f0a87c6.tar.gz | |
Merge branch 'wip/carlosg/wayland-session-checks' into 'master'
Resort to WAYLAND_DISPLAY checks to avoid X11 connections
See merge request GNOME/at-spi2-core!14
Diffstat (limited to 'atspi')
| -rw-r--r-- | atspi/atspi-misc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/atspi/atspi-misc.c b/atspi/atspi-misc.c index 8d708496..f6809996 100644 --- a/atspi/atspi-misc.c +++ b/atspi/atspi-misc.c @@ -1601,7 +1601,8 @@ atspi_get_a11y_bus (void) if (address_env != NULL && *address_env != 0) address = g_strdup (address_env); #ifdef HAVE_X11 - if (!address && g_strcmp0 (g_getenv ("XDG_SESSION_TYPE"), "x11") == 0) + if (!address && g_getenv ("DISPLAY") != NULL && + g_getenv ("WAYLAND_DISPLAY") == NULL) address = get_accessibility_bus_address_x11 (); #endif if (!address) |