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

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

commit d5104460c62cd0ce9c298f8be41d69d625600e6a
Author: Mihai Moldovan <io...@ionic.de>
Date:   Fri Oct 30 02:32:34 2015 +0100

    pulsemanager.{cpp,h}: rename relaunch () to restart ().
---
 debian/changelog     |    1 +
 src/pulsemanager.cpp |    2 +-
 src/pulsemanager.h   |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c68bd39..aa58b9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -174,6 +174,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - pulsemanager.h: add std:: namespace selector for uint32_t version
       variables.
     - pulsemanager.{cpp,h}: add ESD support.
+    - pulsemanager.{cpp,h}: rename relaunch () to restart ().
 
  -- 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 c92d64f..6999c18 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -286,7 +286,7 @@ void PulseManager::set_esd_port (std::uint16_t esd_port) {
   esd_port_ = esd_port;
 }
 
-void PulseManager::relaunch () {
+void PulseManager::restart () {
   if (pulse_server_ && is_server_running ())
     shutdown ();
 
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index 22ab771..aae71e3 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -53,7 +53,7 @@ class PulseManager: public QObject {
 
   public slots:
     void start ();
-    void relaunch ();
+    void restart ();
 
   private:
     PulseManager (const PulseManager &other);

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