diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-14 20:09:41 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-14 20:09:41 -0500 |
| commit | 07b3d083b49b4cbb248b5ba0aeba2bbdd3cc487d (patch) | |
| tree | 5f80a6862e44b938c4e7f62f457d1b48f5a0195b /vcl/unx/generic/plugadapt | |
| parent | 007f16ef7ad40ae932df884ba04f0de71928b852 (diff) | |
TDE integration
Change-Id: I6f468005c8d8d99d9251a9c4fe4629b98bc4aa5e
Diffstat (limited to 'vcl/unx/generic/plugadapt')
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index d2400d7f857b..ab19d345251f 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -98,7 +98,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals * #i109007# KDE3 seems to have the same problem. * And same applies for KDE4. */ - if( rModuleBase == "gtk" || rModuleBase == "gtk3" || rModuleBase == "kde" || rModuleBase == "kde4" ) + if( rModuleBase == "gtk" || rModuleBase == "gtk3" || rModuleBase == "tde" || rModuleBase == "kde" || rModuleBase == "kde4" ) { pCloseModule = NULL; } @@ -159,6 +159,11 @@ static DesktopType get_desktop_environment() static SalInstance* autodetect_plugin() { + static const char* pTDEFallbackList[] = + { + "tde", "kde4", "kde", "gtk3", "gtk", "gen", 0 + }; + static const char* pKDEFallbackList[] = { "kde4", "kde", "gtk3", "gtk", "gen", 0 @@ -183,6 +188,11 @@ static SalInstance* autodetect_plugin() pList = pHeadlessFallbackList; else if ( desktop == DESKTOP_GNOME ) pList = pStandardFallbackList; + else if( desktop == DESKTOP_TDE ) + { + pList = pTDEFallbackList; + nListEntry = 1; + } else if( desktop == DESKTOP_KDE ) { pList = pKDEFallbackList; @@ -236,7 +246,7 @@ SalInstance *CreateSalInstance() pInst = autodetect_plugin(); // fallback, try everything - const char* pPlugin[] = { "gtk3", "gtk", "kde4", "kde", "gen", 0 }; + const char* pPlugin[] = { "gtk3", "gtk", "tde", "kde4", "kde", "gen", 0 }; for ( int i = 0; !pInst && pPlugin[ i ]; ++i ) pInst = tryInstance( OUString::createFromAscii( pPlugin[ i ] ) ); @@ -291,7 +301,7 @@ void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore ) _exit(1); } -static const char * desktop_strings[] = { "none", "unknown", "GNOME", "KDE", "KDE4" }; +static const char * desktop_strings[] = { "none", "unknown", "GNOME", "TDE", "KDE", "KDE4" }; const OUString& SalGetDesktopEnvironment() { |