[X2Go-Commits] [x2goclient] 264/267: src/{onmainwindow, pulsemanager}.cpp: actually *use* what we got back from add_to_path ()...

[git-admin at x2go.org]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit ee8ddf670261d95c8f4e92fe7d0d6efd2d781295
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Dec 9 16:54:33 2016 +0100

    src/{onmainwindow,pulsemanager}.cpp: actually *use* what we got back from add_to_path ()...
    
    Fixes a few bugs here and there.
---
 debian/changelog     |    2 ++
 src/onmainwindow.cpp |    2 +-
 src/pulsemanager.cpp |    4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0d07f1f..ab1e672 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -483,6 +483,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
       let's always do it right before starting the sshd binary.
     - src/onmainwindow.cpp: stop duplicating the list of known sftp-server
       binary locations.
+    - src/{onmainwindow,pulsemanager}.cpp: actually *use* what we got back
+      from add_to_path ()... Fixes a few bugs here and there.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index ada6f7a..fe1cb71 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10176,7 +10176,7 @@ void ONMainWindow::generateEtcFiles()
     QProcessEnvironment tmp_env = QProcessEnvironment::systemEnvironment ();
     QString path_val = tmp_env.value ("PATH");
 
-    add_to_path (path_val, common_sftp_dirs);
+    path_val = add_to_path (path_val, common_sftp_dirs);
 
     /* Just in case we bundle sftp-server ourselves. */
     sftp_binary = find_binary (appDir, "sftp-server");
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index a956054..8b2e736 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -72,8 +72,8 @@ PulseManager::PulseManager () : app_dir_ (QApplication::applicationDirPath ()),
   to_front << "/opt/local/bin"; /* MacPorts default prefix, FIXME: might need to make that configurable. */
   to_back << "/usr/local/bin"; /* Homebrew or random stuff. Probably even both intermingled... */
 
-  add_to_path (path_val, to_back);
-  add_to_path (path_val, to_front, false);
+  path_val = add_to_path (path_val, to_back);
+  path_val = add_to_path (path_val, to_front, false);
 
   server_binary_ = find_binary (server_working_dir_, "pulseaudio");
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git