[Libreoffice-commits] .: 2 commits - vcl/unx

[David Tardon]

 vcl/unx/source/plugadapt/salplug.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit eabd3602dce7e694123dd11e11b4ca7fce9f1acc
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 3 09:27:06 2011 +0200

    always use svp plugin with --headless

diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx
index 0142eb3..9e6bb1f 100644
--- a/vcl/unx/source/plugadapt/salplug.cxx
+++ b/vcl/unx/source/plugadapt/salplug.cxx
@@ -230,9 +230,9 @@ SalInstance *CreateSalInstance()
 
     static const char* pUsePlugin = getenv( "SAL_USE_VCLPLUGIN" );
 
-    if( !(pUsePlugin && *pUsePlugin) )
-        pInst = check_headless_plugin();
-    else
+    pInst = check_headless_plugin();
+
+    if( !pInst && pUsePlugin && *pUsePlugin )
         pInst = tryInstance( OUString::createFromAscii( pUsePlugin ) );
     
     if( ! pInst )
commit 59585795ac0041c3e92dd2038f22f548a78e5f77
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 3 08:34:12 2011 +0200

    add kde4 to fallback list

diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx
index 7bebeeb..0142eb3 100644
--- a/vcl/unx/source/plugadapt/salplug.cxx
+++ b/vcl/unx/source/plugadapt/salplug.cxx
@@ -239,7 +239,7 @@ SalInstance *CreateSalInstance()
         pInst = autodetect_plugin();
     
     // fallback, try everything
-    const char* pPlugin[] = { "gtk", "kde", "gen", 0 };
+    const char* pPlugin[] = { "gtk", "kde4", "kde", "gen", 0 };
 
     for ( int i = 0; !pInst && pPlugin[ i ]; ++i )
         pInst = tryInstance( OUString::createFromAscii( pPlugin[ i ] ) );