[X2Go-Commits] [x2goclient] 119/257: pulsemanager.{cpp, h}: find_port () actually returns a value, fix declaration accordingly.
git-admin at x2go.org
git-admin at x2go.org
Mon Nov 28 16:05:31 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 4e542e7f33884a7e6a55b9ebd6673572903d99a7
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Nov 30 04:39:33 2015 +0100
pulsemanager.{cpp,h}: find_port () actually returns a value, fix declaration accordingly.
---
debian/changelog | 2 ++
src/pulsemanager.cpp | 2 +-
src/pulsemanager.h | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4dcb5e4..ed9351e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -203,6 +203,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
- pulsemanager.cpp: make startup sound playing via
slot_play_startup_sound () Windows-compatible.
- pulsemanager.cpp: typo fix in variable name server_working_dir_.
+ - pulsemanager.{cpp,h}: find_port () actually returns a value, fix
+ declaration accordingly.
[ Bernard Cafarelli ]
* New upstream version (4.0.5.3):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 7dda3d2..ae8ece9 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -142,7 +142,7 @@ void PulseManager::start_win () {
}
}
-void PulseManager::find_port (bool search_esd) {
+bool PulseManager::find_port (bool search_esd) {
QTcpSocket tcpSocket (0);
bool free = false;
std::uint16_t ret = pulse_port_;
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index a42f1ca..e1a088a 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -63,7 +63,7 @@ class PulseManager: public QObject {
// FIXME
void start_linux ();
void start_generic ();
- void find_port (bool search_esd = false);
+ bool find_port (bool search_esd = false);
bool generate_server_config ();
bool generate_client_config ();
void cleanup_client_dir ();
--
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