This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 3e88876 debian/control: add myself as uploader. new a8a4610 src/onmainwindow.cpp: add some comments related to maybe using add_to_path (). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ src/onmainwindow.cpp | 4 ++++ 2 files changed, 6 insertions(+) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit a8a46100995ed846030cb3b2925e33d78807caec Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jun 30 23:17:27 2016 +0200 src/onmainwindow.cpp: add some comments related to maybe using add_to_path (). --- debian/changelog | 2 ++ src/onmainwindow.cpp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0f8fa45..a6132e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium and is cumbersome to use, but there seems to be no other way to do that... - src/help.h: typo fix in comment only. + - src/onmainwindow.cpp: add some comments related to maybe using + add_to_path (). * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. - Uploaders: add myself. Also, force a rebuild due to the changed diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 357e922..77880f4 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -5513,6 +5513,7 @@ void ONMainWindow::slotTunnelOk(int) #if defined ( Q_OS_DARWIN ) // setting /usr/X11/bin to find xauth // /usr/X11R6/bin is added for compatibility reasons with OS X 10.4. + /* FIXME: don't just overwrite this stuff, use add_to_path () instead. */ env.insert ( 0, "PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin:/usr/X11R6/bin" ); @@ -8640,6 +8641,8 @@ void ONMainWindow::slotStartPGPAuth() QStringList arguments; arguments<<"--multi-server"; + /* FIXME: probably use add_to_path () instead. */ + QProcessEnvironment scdaemon_env = QProcessEnvironment::systemEnvironment (); QString path_env_separator = ":"; @@ -9107,6 +9110,7 @@ QString ONMainWindow::getXDisplay() x2goDebug<< "Starting the X server on free display port."; + /* FIXME: why not passing our current environment, maybe extended via add_to_path ()? */ env.insert (0, "PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin"); startx->setProcessEnvironment (env); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org