diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2018-09-17 17:41:41 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2018-09-18 12:50:53 +0200 |
| commit | 79093cce6c3a65f84bbafd172b1e9e6702d3ce75 (patch) | |
| tree | 4b8b48decb56a8d6abf7f5c1e3e53cb21d6b129b /vcl | |
| parent | ba156df0c103fde35c9750e321f091d81df0a4a6 (diff) | |
tdf#119881: Check if Unity/Gnome is separated by colon in XDG_CURRENT_DESKTOP
Change-Id: Ie29c2213d8efccd7750396325ce05b4909c09d02
Reviewed-on: https://gerrit.libreoffice.org/60592
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/generic/desktopdetect/desktopdetector.cxx | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx index e39348c460e6..56f6fe1d2d6c 100644 --- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx +++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx @@ -33,6 +33,7 @@ #include <unistd.h> #include <string.h> +#include <comphelper/string.hxx> static bool is_gnome_desktop( Display* pDisplay ) { @@ -246,14 +247,24 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment() aDesktopSession = OString( pSession, strlen( pSession ) ); const char *pDesktop; - OString aCurrentDesktop; if ( ( pDesktop = getenv( "XDG_CURRENT_DESKTOP" ) ) ) - aCurrentDesktop = OString( pDesktop, strlen( pDesktop ) ); + { + OString aCurrentDesktop = OString( pDesktop, strlen( pDesktop ) ); + + //it may be separated by colon ( e.g. unity:unity7:ubuntu ) + std::vector<OUString> aSplitCurrentDesktop = comphelper::string::split( + OStringToOUString( aCurrentDesktop, RTL_TEXTENCODING_UTF8), ':'); + for (auto& rCurrentDesktopStr : aSplitCurrentDesktop) + { + if ( rCurrentDesktopStr.equalsIgnoreAsciiCase( "unity" ) ) + return DESKTOP_UNITY; + else if ( rCurrentDesktopStr.equalsIgnoreAsciiCase( "gnome") ) + return DESKTOP_GNOME; + } + } // fast environment variable checks - if ( aCurrentDesktop.equalsIgnoreAsciiCase( "unity" ) ) - ret = DESKTOP_UNITY; - else if ( aDesktopSession.equalsIgnoreAsciiCase( "gnome" ) ) + if ( aDesktopSession.equalsIgnoreAsciiCase( "gnome" ) ) ret = DESKTOP_GNOME; else if ( aDesktopSession.equalsIgnoreAsciiCase( "gnome-wayland" ) ) ret = DESKTOP_GNOME; |