[X2Go-Commits] [x2goclient] 124/217: pulsemanager.cpp: add "dummy" start_linux () function.
git-admin at x2go.org
git-admin at x2go.org
Wed Sep 21 01:09:03 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 93d875c32e8ab883ee81f45baa5f295db3786236
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 5f74bdd..f978f31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -204,8 +204,9 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
- 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.
-- X2Go Release Manager <git-admin at x2go.org> Mon, 19 Sep 2016 09:07:07 +0200
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