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

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

commit 904a875ddc56332916abe21e74596fd3b715d2ed
Author: Mihai Moldovan <io...@ionic.de>
Date:   Thu Oct 1 01:28:05 2015 +0200

    pulsemanager.{cpp,h}: add pulse_version_{major,minor}_ member variables.
---
 debian/changelog     |    1 +
 src/pulsemanager.cpp |    3 ++-
 src/pulsemanager.h   |    2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index eecfcd9..555e786 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -168,6 +168,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - pulsemanager.cpp: minor non-behavior changing fixes.
     - pulsemanager.{cpp,h}: reformat only.
     - pulsemanager.cpp: use initializer list for constructor.
+    - pulsemanager.{cpp,h}: add pulse_version_{major,minor}_ member variables.
 
  -- 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 002c9f8..c1d8d8f 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -26,7 +26,8 @@
 
 PulseManager::PulseManager () : pulse_X2Go_("/.x2go/pulse"), pulse_port_(4713),
                                 state_(QProcess::NotRunning), 
pulse_server_(NULL),
-                                app_dir_(QApplication::applicationDirPath ()) {
+                                app_dir_(QApplication::applicationDirPath ()),
+                                pulse_version_major_(0), 
pulse_version_minor_(0) {
   pulse_dir_ = QDir (QDir::homePath ());
   pulse_dir_.mkpath (pulse_dir_.absolutePath () + pulse_X2Go_ + "/tmp");
   pulse_dir_.cd (pulse_X2Go_.mid (1));
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index e391af8..5b1fe37 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -81,6 +81,8 @@ class PulseManager: public QObject {
     int pulse_port_;
     QProcess::ProcessState state_;
     QString app_dir_;
+    uint32_t pulse_version_major_;
+    uint32_t pulse_version_minor_;
 };
 
 #ifdef NDEBUG_DEFINE

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