This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 5afe40516a4d170c3a1dd463f1a358977a96e582
Author: Mihai Moldovan <io...@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 b8c4b30..42f1caa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -201,6 +201,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.
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
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
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

Reply via email to