[Libreoffice-commits] core.git: vcl/unx

Luboš Luňák l.lunak at suse.cz
Thu Jun 6 09:10:03 PDT 2013


 vcl/unx/generic/app/saldisp.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit c4f58395bd1f36a3ff4e2dd514907c74c86112b5
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Jun 6 17:05:25 2013 +0200

    simplify WM_COMMAND
    
    it's not necessary to prepend /bin/sh to WM_COMMAND, soffice itself
    already is executable
    
    Change-Id: Iece77f901f233c8c675f524c8c88510d0cfc1c52

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 90935aa..75b2d2e 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -494,10 +494,9 @@ SalDisplay::initScreen( SalX11Screen nXScreen ) const
                          );
 
         OString aExec(OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding()));
-        const char* argv[2];
-        argv[0] = "/bin/sh";
-        argv[1] = aExec.getStr();
-        XSetCommand( pDisp_, pSD->m_aRefWindow, const_cast<char**>(argv), 2 );
+        const char* argv[1];
+        argv[0] = aExec.getStr();
+        XSetCommand( pDisp_, pSD->m_aRefWindow, const_cast<char**>(argv), 1 );
         XSelectInput( pDisp_, pSD->m_aRefWindow, PropertyChangeMask );
 
         // - - - - - - - - - - GCs - - - - - - - - - - - - - - - - -


More information about the Libreoffice-commits mailing list