[Libreoffice-commits] core.git: vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/generic/desktopdetect/desktopdetector.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b63d48a146c3615f56b6ec83361b3c02ebcbb215
Author:     Simon Quigley <tsimonq2 at ubuntu.com>
AuthorDate: Sat Oct 13 14:40:00 2018 -0500
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Sun Oct 14 00:34:16 2018 +0200

    Add some additional verification for LXQt as the desktop environment.
    
    ac9c14dbbd3a4341de0aa1b1dbc37ad2ce69398c added initial support for LXQt
    as a desktop environment under Linux, but this only works where a pure
    LXQt session is started and not when an LXQt distributor's session has
    been started.
    
    In upstream LXQt, $XDG_CURRENT_DESKTOP is always set to LXQt, so check
    that first.
    
    Change-Id: Ifaa1f85192dc7a943911846e1cb39cf49be03baf
    Reviewed-on: https://gerrit.libreoffice.org/61751
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index bf70b376c0e0..b446f7c397dd 100644
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -260,8 +260,10 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment()
         {
             if ( rCurrentDesktopStr.equalsIgnoreAsciiCase( "unity" ) )
                 return DESKTOP_UNITY;
-            else if ( rCurrentDesktopStr.equalsIgnoreAsciiCase( "gnome") )
+            else if ( rCurrentDesktopStr.equalsIgnoreAsciiCase( "gnome" ) )
                 return DESKTOP_GNOME;
+            else if ( rCurrentDesktopStr.equalsIgnoreAsciiCase( "lxqt" ) )
+                return DESKTOP_LXQT;
         }
     }