[at-spi2-core: 2/2] Merge branch 'wip/carlosg/wayland-session-checks' into 'master'

[Mike Gorse <mgorse src gnome org>]

commit 6e0e94d0f3e257f87d89e7b23ee7be5e1f0a87c6
Merge: 92ae948 b68e60b
Author: Mike Gorse <mgorse suse com>
Date:   Wed May 22 00:09:24 2019 +0000

    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

 atspi/atspi-misc.c                | 3 ++-
 bus/at-spi-bus-launcher.c         | 4 ++--
 registryd/deviceeventcontroller.c | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
---