[X2Go-Commits] [x2goclient] 01/01: src/onmainwindow.cpp: remove client-side LD_LIBRARY_PATH meddling.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 3d9d0611287b281410b7abb64e117a49158f2048
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Dec 18 16:34:28 2017 +0100

    src/onmainwindow.cpp: remove client-side LD_LIBRARY_PATH meddling.
    
    Nothing of value is in that directory and nxproxy hasn't needed that for
    years.
---
 debian/changelog     | 3 +++
 src/onmainwindow.cpp | 6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e3a4322..4eed318 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,9 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium
       well...
     - {example/x2goclient-cli,src/onmainwindow.cpp}: remove hopefully obsolete
       HOSTNAME exporting into environment.
+    - src/onmainwindow.cpp: remove client-side LD_LIBRARY_PATH meddling.
+      Nothing of value is in that directory and nxproxy hasn't needed that for
+      years.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.1.1):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 0628411..ae3f11d 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -5814,7 +5814,6 @@ void ONMainWindow::slotTunnelOk(int)
     nxproxy=new QProcess;
     proxyErrString="";
     QStringList env = QProcess::systemEnvironment();
-    QString x2golibpath="/usr/lib/x2go";
 #if defined ( Q_OS_WIN ) || defined ( Q_OS_DARWIN )
     int dispInd=-1;
 #endif
@@ -5822,10 +5821,6 @@ void ONMainWindow::slotTunnelOk(int)
     {
 // 		x2goDebug<<env[l]<<endl;
 
-        if ( env[l].indexOf ( "X2GO_LIB" ) ==0 )
-        {
-            x2golibpath=env[l].split ( "=" ) [1];
-        }
 #if defined ( Q_OS_WIN ) || defined ( Q_OS_DARWIN )
         if ( env[l].indexOf ( "DISPLAY" ) ==0 )
         {
@@ -5833,7 +5828,6 @@ void ONMainWindow::slotTunnelOk(int)
         }
 #endif
     }
-    env << "LD_LIBRARY_PATH="+x2golibpath;
     env << "NX_CLIENT="+QCoreApplication::applicationFilePath ();
 
 #if defined ( Q_OS_WIN ) || defined ( Q_OS_DARWIN )

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git