[X2Go-Commits] [x2goclient] 114/138: pulsemanager.cpp: make generate_client_config () Windows-compatible.
git-admin at x2go.org
git-admin at x2go.org
Mon Jan 18 22:48:54 CET 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 1c7bf9761a959240c3ad08422206ed4e8a089c7e
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Oct 30 03:44:53 2015 +0100
pulsemanager.cpp: make generate_client_config () Windows-compatible.
---
debian/changelog | 1 +
src/pulsemanager.cpp | 12 +++++++++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0b2afc2..448b2ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -211,6 +211,7 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
functionality.
- pulsemanager.cpp: also load module-esound-protocol-tcp module.
- pulsemanager.cpp: make generate_server_config () Windows-compatible.
+ - pulsemanager.cpp: make generate_client_config () Windows-compatible.
* debian/control:
- Change apache2-dev | libc6-dev build dependency back to apache2-dev
only. Otherwise, apache2-dev is not installed at all, even though
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 3704000..5e66e44 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -236,21 +236,27 @@ bool PulseManager::generate_server_config () {
bool PulseManager::generate_client_config () {
QTemporaryFile client_config_tmp_file (pulse_dir_.absolutePath ()
+ "/tmp/tmpconfig");
- QString client_config_file_name (pulse_dir_.absolutePath () + "/.pulse/client.conf");
+ QString client_config_file_name (pulse_dir_.absolutePath ()
+ + "/.pulse/client.conf");
bool ret = false;
if (client_config_tmp_file.open ()) {
QTextStream config_tmp_file_stream (&client_config_tmp_file);
config_tmp_file_stream << "autospawn=no" << endl;
+#ifdef Q_OS_WIN
+ config_tmp_file_stream << "default-server=localhost:" << pulse_port_ << endl;
+#endif // defined (Q_OS_WIN)
config_tmp_file_stream << "daemon-binary="
- << QDir (app_dir_
- + "/../exe/pulseaudio").absolutePath ()
+ << QDir::toNativeSeparators (QDir (server_binary_).absolutePath ())
<< endl;
if (QFile::exists (client_config_file_name))
QFile::remove (client_config_file_name);
+ QDir client_config_dir (pulse_dir_.absolutePath () + "/.pulse/");
+ client_config_dir.mkpath (client_config_dir.absolutePath ());
+
client_config_tmp_file.copy (client_config_file_name);
client_config_tmp_file.remove ();
--
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