vcl/unx/generic/desktopdetect/desktopdetector.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 5c76768ff1ef38ead30b32544b180464fe0e7794
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jul 17 11:28:37 2015 +0100
add gnome-wayland alongside gnome
Change-Id: I5d57f715edbadc7fef5c508cae7e98bcde0e4e5c
(cherry picked from commit edaacb62d057a3d68b473a36fcf9b1c6059fbfcc)
Reviewed-on: https://gerrit.libreoffice.org/17169
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index 4a0838b..0cc1f35 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" ) )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
