This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit f175965b1ec2b9c6cd5ed89064ca11b98732195a
Author: Mihai Moldovan <io...@ionic.de>
Date: Mon Jul 11 05:34:22 2016 +0200
src/pulsemanager.cpp: make sure that wherever we interface with non-Qt
functions, paths are in native form (i.e., containing empty separators, instead
of the "generic" slash UNIX-style separator.)
Should fix a PA startup issue on Windows.
---
debian/changelog | 4 ++++
src/pulsemanager.cpp | 24 ++++++++++++------------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6a4db4e..b26a98e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -360,6 +360,10 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
errors. OS X was fine with its "8.0.0-something" version number, but the
optional part at the end or even the micro version number could be
missing any time.
+ - src/pulsemanager.cpp: make sure that wherever we interface with non-Qt
+ functions, paths are in native form (i.e., containing empty separators,
+ instead of the "generic" slash UNIX-style separator.) Should fix a PA
+ startup issue on Windows.
[ Bernard Cafarelli ]
* New upstream version (4.0.5.3):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 1da7ea4..6170634 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -51,10 +51,10 @@ PulseManager::PulseManager () : app_dir_
(QApplication::applicationDirPath ()),
pulse_dir_.cd (pulse_X2Go_.mid (1));
env_ = QProcessEnvironment::systemEnvironment ();
- env_.insert ("HOME", pulse_dir_.absolutePath ());
- env_.insert ("TEMP", pulse_dir_.absolutePath () + "/tmp");
+ env_.insert ("HOME", QDir::toNativeSeparators (pulse_dir_.absolutePath ()));
+ env_.insert ("TEMP", QDir::toNativeSeparators (pulse_dir_.absolutePath () +
"/tmp"));
#ifdef Q_OS_WIN
- env_.insert ("USERPROFILE", pulse_dir_.absolutePath ());
+ env_.insert ("USERPROFILE", QDir::toNativeSeparators
(pulse_dir_.absolutePath ()));
env_.insert ("USERNAME", "pulseuser");
#endif // defined (Q_OS_WIN)
@@ -277,16 +277,16 @@ void PulseManager::start_generic () {
void PulseManager::start_osx () {
server_args_ = QStringList ();
server_args_ << "--exit-idle-time=-1" << "-n"
- << "-F" << pulse_dir_.absolutePath () + "/config.pa";
+ << "-F" << QDir::toNativeSeparators (pulse_dir_.absolutePath ()
+ "/config.pa");
if (!system_pulse_) {
server_args_ << "-p"
- << QDir (app_dir_
- + "/../Frameworks/pulse-"
- + QString::number (pulse_version_major_)
- + "."
- + QString::number (pulse_version_minor_)
- + "/modules").absolutePath ();
+ << QDir::toNativeSeparators (QDir (app_dir_
+ + "/../Frameworks/pulse-"
+ + QString::number
(pulse_version_major_)
+ + "."
+ + QString::number
(pulse_version_minor_)
+ + "/modules").absolutePath
());
}
server_args_ << "--high-priority";
@@ -294,7 +294,7 @@ void PulseManager::start_osx () {
if (debug_) {
server_args_ << "--log-level=debug"
<< "--verbose"
- << "--log-target=file:" + pulse_dir_.absolutePath () +
"/pulse.log";
+ << "--log-target=file:" + QDir::toNativeSeparators
(pulse_dir_.absolutePath () + "/pulse.log");
}
if (generate_server_config () && generate_client_config ()) {
@@ -322,7 +322,7 @@ void PulseManager::start_win () {
if (debug_) {
server_args_ << "--log-level=debug"
<< "--verbose"
- << "--log-target=file:" + pulse_dir_.absolutePath () +
"\\pulse.log";
+ << "--log-target=file:" + QDir::toNativeSeparators
(pulse_dir_.absolutePath () + "/pulse.log");
}
/*
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits
