[X2Go-Commits] [x2goclient] 15/31: src/pulsemanager.{cpp, h}: make is_server_running () const.
git-admin at x2go.org
git-admin at x2go.org
Sun Mar 5 23:22:24 CET 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit 7ce4e35e79b389d8a80e8c55e4aed31f3a087f17
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sat Feb 25 03:41:07 2017 +0100
src/pulsemanager.{cpp,h}: make is_server_running () const.
---
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 14ea9c5..aee212b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -98,6 +98,7 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
- {src/{configdialog,x2goutils}.cpp,res/i18n/x2goclient_*.ts}: change
XQuartz project homepage references, adapt translations.
- src/pulsemanager.{cpp,h}: make get_* () functions const.
+ - src/pulsemanager.{cpp,h}: make is_server_running () const.
[ Oleksandr Shneyder ]
* New upstream version (4.1.0.1):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index b941bf7..a5c164c 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -813,7 +813,7 @@ void PulseManager::slot_on_pulse_finished (int exit_code) {
emit (sig_pulse_server_terminated ());
}
-bool PulseManager::is_server_running () {
+bool PulseManager::is_server_running () const {
if (pulse_server_)
return (pulse_server_->state () == QProcess::Running);
else
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index c85bd85..38cc837 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -88,7 +88,7 @@ class PulseManager: public QObject {
void shutdown ();
- bool is_server_running ();
+ bool is_server_running () const;
private slots:
--
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