diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-17 11:28:37 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:56:32 +0200 |
| commit | 9cb11afc6112694a3e273a00477165253b72c043 (patch) | |
| tree | 8562e919e601656277406f87ed05c607181776e2 /vcl | |
| parent | 70201d62e968da6d60a8e0f2fdefd9995f70333e (diff) | |
add gnome-wayland alongside gnome
Change-Id: I5d57f715edbadc7fef5c508cae7e98bcde0e4e5c
(cherry picked from commit edaacb62d057a3d68b473a36fcf9b1c6059fbfcc)
Reviewed-on: https://gerrit.libreoffice.org/17169
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/generic/desktopdetect/desktopdetector.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx index 4a0838b5ba34..0cc1f35fe8dd 100644 --- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx +++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx @@ -307,6 +307,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment() return DESKTOP_KDE4; if ( aOver.equalsIgnoreAsciiCase( "gnome" ) ) return DESKTOP_GNOME; + if ( aOver.equalsIgnoreAsciiCase( "gnome-wayland" ) ) + return DESKTOP_GNOME; if ( aOver.equalsIgnoreAsciiCase( "unity" ) ) return DESKTOP_UNITY; if ( aOver.equalsIgnoreAsciiCase( "xfce" ) ) @@ -382,6 +384,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment() ret = DESKTOP_UNITY; else if ( aDesktopSession.equalsIgnoreAsciiCase( "gnome" ) ) ret = DESKTOP_GNOME; + else if ( aDesktopSession.equalsIgnoreAsciiCase( "gnome-wayland" ) ) + ret = DESKTOP_GNOME; else if ( aDesktopSession.equalsIgnoreAsciiCase( "mate" ) ) ret = DESKTOP_MATE; else if ( aDesktopSession.equalsIgnoreAsciiCase( "xfce" ) ) |