[X2Go-Commits] [x2goclient] 121/217: pulsemanager.cpp: fix another compile error due to typo'd versions of generate_server_config () and generate_client_config ().

git-admin at x2go.org git-admin at x2go.org
Sat Aug 27 19:25:32 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 f357c0a68465dc38696852d8eb4fabe55ba2cb80
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Nov 30 04:49:35 2015 +0100

    pulsemanager.cpp: fix another compile error due to typo'd versions of generate_server_config () and generate_client_config ().
---
 debian/changelog     |    2 ++
 src/pulsemanager.cpp |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9211be0..f32e962 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -234,6 +234,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
       declaration accordingly.
     - pulsemanager.cpp: fix compile errors in find_port () by renaming the ret
       or port variable to search_port.
+    - pulsemanager.cpp: fix another compile error due to typo'd versions of
+      generate_server_config () and generate_client_config ().
   * 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 7b0fa65..ecf47a3 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -135,7 +135,7 @@ void PulseManager::start_win () {
   server_working_dir_ = QString (app_dir_ + "/pulse/");
   server_binary_ = QString (app_dir_ + "/pulse/pulseaudio.exe");
 
-  if (generateServerConfig () && generateClientConfig ()) {
+  if (generate_server_config () && generate_client_config ()) {
     create_client_dir ();
 
     start_generic ();

--
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