This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit cdbcf5c421510031ede175ba991ecdea310cd3f8 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jun 3 02:28:12 2015 +0200 onmainwindow.cpp: drop a redundant variable and fix empty env check. --- debian/changelog | 1 + src/onmainwindow.cpp | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index ea77b8b..b14e9da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low Also correctly append to informative_text on one occasion, instead of overwriting it. - x2goutils.cpp: correct typo to fix compile errors. + - onmainwindow.cpp: drop a redundant variable and fix empty env check. -- X2Go Release Manager <git-admin@x2go.org> Tue, 26 May 2015 21:42:09 +0200 diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 4e6f017..3968ece 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -8343,11 +8343,10 @@ void ONMainWindow::slotStartPGPAuth() path_env_separator = ";"; #endif - QString old_path_value = scdaemon_env.value ("PATH", ""); - QString new_path_value = ""; + QString new_path_value = scdaemon_env.value ("PATH", ""); - if (!old_path_value.isEmpty ()) { - new_path_value = old_path_value + path_env_separator; + if (!new_path_value.isEmpty ()) { + new_path_value += path_env_separator; } new_path_value += "/usr/lib/gnupg2/"; @@ -8442,7 +8441,7 @@ void ONMainWindow::slotScDaemonError (QProcess::ProcessError error) { QProcessEnvironment tmp_env = QProcessEnvironment::systemEnvironment (); - if (!scDaemon->processEnvironment ().isEmpty ()) { + if (!(scDaemon->processEnvironment ().isEmpty ())) { tmp_env = scDaemon->processEnvironment (); } -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git