diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-11-08 19:26:36 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-09 16:33:22 +0100 |
| commit | 293526165fcd236ba1742de2feec6ea06376e83f (patch) | |
| tree | dc49b74a3cf1ab637381afe41e2bc1fa86f2ee56 /vcl/unx/generic | |
| parent | 9a103b6478fa2796747d6d16a4625c81d29e614f (diff) | |
tdf#121275 fallback to gtk3 under wayland with unknown desktop
Change-Id: Ie63da823faf9067e61ca4870f464d49425bbc907
Reviewed-on: https://gerrit.libreoffice.org/63123
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx/generic')
| -rw-r--r-- | vcl/unx/generic/desktopdetect/desktopdetector.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx index b446f7c397dd..e7cb9b93e801 100644 --- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx +++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx @@ -280,6 +280,12 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment() ret = DESKTOP_LXQT; else { + // tdf#121275 if we still can't tell, and WAYLAND_DISPLAY + // is set, default to gtk3 + const char* pWaylandStr = getenv("WAYLAND_DISPLAY"); + if (pWaylandStr && *pWaylandStr) + return DESKTOP_GNOME; + // these guys can be slower, with X property fetches, // round-trips etc. and so are done later. |