[X2Go-Commits] [x2goclient] 182/197: src/pulsemanager.cpp: add comments to Qt 4 code part.

git-admin at x2go.org git-admin at x2go.org
Thu Jun 30 23:53:40 CEST 2016


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

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

commit b5567ef0c6be58169da0abca80ed469ca2344ed1
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jun 22 02:20:22 2016 +0200

    src/pulsemanager.cpp: add comments to Qt 4 code part.
---
 debian/changelog     |    1 +
 src/pulsemanager.cpp |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4c43dc3..9014d6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -337,6 +337,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
       function, as Qt 5 includes QStandardPaths::findExecutable ().
     - src/pulsemanager.cpp: auto-detect PA binary in $PATH and MacPorts
       default prefix as well on OS X.
+    - src/pulsemanager.cpp: add comments to Qt 4 code part.
   * debian/control:
     - Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
     - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 1e23d89..47e1b7c 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -69,8 +69,8 @@ PulseManager::PulseManager () : app_dir_ (QApplication::applicationDirPath ()),
   QString path_val = tmp_env.value ("PATH");
 
   QStringList to_front, to_back;
-  to_front << "/opt/local/bin";
-  to_back << "/usr/local/bin";
+  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);

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


More information about the x2go-commits mailing list