[X2Go-Commits] [x2goclient] 191/197: src/pulsemanager.cpp: fix compile error on Windows.
git-admin at x2go.org
git-admin at x2go.org
Thu Jun 30 23:53:49 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 7e647d672836a33d2ab8ba22a8b0794c5814fc4d
Author: Mihai Moldovan <ionic at ionic.de>
Date: Wed Jun 22 04:04:10 2016 +0200
src/pulsemanager.cpp: fix compile error on Windows.
---
debian/changelog | 1 +
src/pulsemanager.cpp | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 005a7fc..5cba8a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -350,6 +350,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
- src/pulsemanager.cpp: add error message boxes throughout PulseManager.
Don't just abort () the program.
- src/x2goutils.h: fix compile error due to typo.
+ - src/pulsemanager.cpp: fix compile error on Windows.
* 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 1cb7a7e..1de1cc7 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -704,8 +704,8 @@ void PulseManager::slot_play_startup_sound () {
play_file_binary += "/../exe/paplay";
play_file_file += "/../Resources/startup.wav";
#elif defined (Q_OS_WIN)
- playFileBinary += "/pulse/paplay.exe";
- playFileFile += "/startup.wav";
+ play_file_binary += "/pulse/paplay.exe";
+ play_file_file += "/startup.wav";
#else
/* FIXME: implement Linux section. */
#endif // defined (Q_OS_DARWIN)
--
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