Kaydet (Commit) e04b8afe authored tarafından Tomáš Chvátal's avatar Tomáš Chvátal Kaydeden (comit) Samuel Mehrbrodt

Detect KDE5 and fallback to KDE4UI there

Change-Id: I8da53d7b81d28b0051be96c0c4ee0a29d8ed8360
Reviewed-on: https://gerrit.libreoffice.org/12209Reviewed-by: 's avatarSamuel Mehrbrodt <s.mehrbrodt@gmail.com>
Tested-by: 's avatarSamuel Mehrbrodt <s.mehrbrodt@gmail.com>
üst 1cd9c19b
......@@ -272,6 +272,23 @@ static bool is_kde4_desktop( Display* pDisplay )
return false;
}
static bool is_kde5_desktop( Display* pDisplay )
{
if ( NULL != getenv( "KDE_FULL_SESSION" ) )
{
OUString aVer( "5" );
const char *pVer = getenv( "KDE_SESSION_VERSION" );
if ( pVer && aVer.equalsIgnoreAsciiCaseAscii( pVer ) )
return true;
}
if ( KDEVersion( pDisplay ) == 5 )
return true;
return false;
}
extern "C"
{
......@@ -285,6 +302,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment()
if ( aOver.equalsIgnoreAsciiCase( "tde" ) )
return DESKTOP_TDE;
if ( aOver.equalsIgnoreAsciiCase( "kde5" ) )
return DESKTOP_KDE4;
if ( aOver.equalsIgnoreAsciiCase( "kde4" ) )
return DESKTOP_KDE4;
if ( aOver.equalsIgnoreAsciiCase( "gnome" ) )
......@@ -371,6 +390,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment()
// these guys can be slower, with X property fetches,
// round-trips etc. and so are done later.
else if ( is_kde5_desktop( pDisplay ) )
ret = DESKTOP_KDE4;
else if ( is_kde4_desktop( pDisplay ) )
ret = DESKTOP_KDE4;
else if ( is_gnome_desktop( pDisplay ) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment