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

[Mike Gorse <mgorse src gnome org>]

commit ffba513d3c4a275fd665c0cbc4fb9e148eb4d258
Merge: 218af4e c52d4c2
Author: Mike Gorse <mgorse suse com>
Date:   Mon May 20 09:59:22 2019 +0000

    Merge branch 'wip/carlosg/x11-session-checks' into 'master'
    
    Check for X11 session before using X11 paths
    
    See merge request GNOME/at-spi2-core!12

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