diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-06-14 13:56:27 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-06-14 16:34:05 +0100 |
| commit | 1c7c573899987b194916d408e878ba69544a371a (patch) | |
| tree | c6b6e7c918eca3a4ea25bb507f6eea419783be63 /vcl/unx/generic/plugadapt | |
| parent | 49f8eb6ca0de85766c80b1060ef9e24ea4378df0 (diff) | |
Prepare for gtk3
Diffstat (limited to 'vcl/unx/generic/plugadapt')
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index 519e59cd8ccc..3235aa9a58fa 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -84,7 +84,8 @@ static SalInstance* tryInstance( const OUString& rModuleBase ) * So make sure libgtk+ & co are still mapped into memory when * atk-bridge's atexit handler gets called. */ - if( rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("gtk")) ) + if( rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("gtk")) || + rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("gtk3")) ) { pCloseModule = NULL; } @@ -147,12 +148,12 @@ static SalInstance* autodetect_plugin() { static const char* pKDEFallbackList[] = { - "kde4", "kde", "gtk", "gen", 0 + "kde4", "kde", "gtk3", "gtk", "gen", 0 }; static const char* pStandardFallbackList[] = { - "gtk", "gen", 0 + "gtk3", "gtk", "gen", 0 }; static const char* pHeadlessFallbackList[] = @@ -223,7 +224,7 @@ SalInstance *CreateSalInstance() pInst = autodetect_plugin(); // fallback, try everything - const char* pPlugin[] = { "gtk", "kde4", "kde", "gen", 0 }; + const char* pPlugin[] = { "gtk3", "gtk", "kde4", "kde", "gen", 0 }; for ( int i = 0; !pInst && pPlugin[ i ]; ++i ) pInst = tryInstance( OUString::createFromAscii( pPlugin[ i ] ) ); |