[X2Go-Commits] [x2goclient] 175/239: src/pulsemanager.{cpp, h}: rename on_pulse_finished () to slot_on_pulse_finished ().

[git-admin]

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

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

commit 5193f9634139d0c76dc10a3203a04ce0fb0c7c94
Author: Mihai Moldovan <io...@ionic.de>
Date:   Thu Jun 2 01:08:50 2016 +0200

    src/pulsemanager.{cpp,h}: rename on_pulse_finished () to 
slot_on_pulse_finished ().
    
    Oops...
---
 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 40c76c5..771fd81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -295,6 +295,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - src/pulsemanager.cpp: don't overwrite the temporary string variable for
       the current line with what was supposed to hold new data in
       fetch_pulseaudio_version ().
+    - src/pulsemanager.{cpp,h}: rename on_pulse_finished () to
+      slot_on_pulse_finished (). Oops...
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 032c018..ec08e6f 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -584,7 +584,7 @@ void PulseManager::slot_play_startup_sound () {
   }
 }
 
-void PulseManager::on_pulse_finished (int exit_code) {
+void PulseManager::slot_on_pulse_finished (int exit_code) {
   if (!exit_code)
     x2goDebug << "Warning! Pulseaudio's exit code is non-zero.";
 
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index b3b7421..4cd49e4 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -86,7 +86,7 @@ class PulseManager: public QObject {
 
 
   private slots:
-    void on_pulse_finished (int exit_code);
+    void slot_on_pulse_finished (int exit_code);
     void slot_play_startup_sound ();
 
 

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