diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-07-02 21:58:12 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-07-02 21:59:31 +0100 |
| commit | d2a71b952850cdf1a7efc5c0f86df9864201a950 (patch) | |
| tree | cd2ceed4b0b012c5a7883bcdf137ec2d18806d92 /vcl/unx/generic/plugadapt/salplug.cxx | |
| parent | f31fad32005c6709eaae71b49af31264e585478a (diff) | |
fdo#46990 - re-work new desktop checks, guard against NULL DESKTOP_SESSION.
Change-Id: Ia3e408b372989b757f7dde080849e38d315d53cd
Diffstat (limited to 'vcl/unx/generic/plugadapt/salplug.cxx')
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index fba45f1c4a80..4cb49f9bccb1 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -188,7 +188,9 @@ static SalInstance* autodetect_plugin() // no server at all: dummy plugin if ( desktop == DESKTOP_NONE ) pList = pHeadlessFallbackList; - else if ( desktop == DESKTOP_GNOME || desktop == DESKTOP_XFCE || desktop == DESKTOP_MATE ) + else if ( desktop == DESKTOP_GNOME || + desktop == DESKTOP_XFCE || + desktop == DESKTOP_MATE ) pList = pStandardFallbackList; else if( desktop == DESKTOP_TDE ) pList = pTDEFallbackList; @@ -287,7 +289,11 @@ void SalAbort( const OUString& rErrorText, bool bDumpCore ) _exit(1); } -static const char * desktop_strings[] = { "none", "unknown", "GNOME", "XFCE", "MATE", "TDE", "KDE", "KDE4" }; +// Order to match desktops.hxx' DesktopType +static const char * desktop_strings[] = { + "none", "unknown", "GNOME", + "XFCE", "MATE", "TDE", + "KDE", "KDE4" }; const OUString& SalGetDesktopEnvironment() { |