vcl/unx/generic/desktopdetect/desktopdetector.cxx | 6 ++++++ 1 file changed, 6 insertions(+)
New commits: commit 293526165fcd236ba1742de2feec6ea06376e83f Author: Caolán McNamara <[email protected]> AuthorDate: Thu Nov 8 19:26:36 2018 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Nov 9 16:33:22 2018 +0100 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 <[email protected]> Tested-by: Caolán McNamara <[email protected]> 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. _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
