[X2Go-Commits] [x2goclient] 128/142: pulsemanager.cpp: add "dummy" start_linux () function.
git-admin at x2go.org
git-admin at x2go.org
Thu Jan 14 05:10:47 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 2c7b410206628ec40f7e2043209cf49defe4d081
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Nov 30 04:53:38 2015 +0100
pulsemanager.cpp: add "dummy" start_linux () function.
---
debian/changelog | 3 ++-
src/pulsemanager.cpp | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 9b58f8f..dd235ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -221,8 +221,9 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
- pulsemanager.cpp: fix another compile error due to typo'd versions of
generate_server_config () and generate_client_config ().
- pulsemanager.cpp: another typo fix: findPort -> find_port.
- - pulsemanager.cpp: reorder member varibles in initialization list.
+ - pulsemanager.cpp: reorder member variables in initialization list.
Compile warning fix.
+ - pulsemanager.cpp: add "dummy" start_linux () function.
* 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 3d01cde..9c6de0d 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -142,6 +142,10 @@ void PulseManager::start_win () {
}
}
+void PulseManager::start_linux () {
+ /* Do nothing - assumed to be already running. */
+}
+
bool PulseManager::find_port (bool search_esd) {
QTcpSocket tcpSocket (0);
bool free = false;
--
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