[X2Go-Commits] [x2goclient] 129/217: pulsemanager.{cpp, h}: some older PA versions used the major, minor and micro numbering scheme together with a descriptive string.
git-admin at x2go.org
git-admin at x2go.org
Wed Sep 21 01:09:06 CEST 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit a98af8c4c1cc5cf4659400b191e471211337580a
Author: Mihai Moldovan <ionic at ionic.de>
Date: Wed Dec 30 23:11:44 2015 +0100
pulsemanager.{cpp,h}: some older PA versions used the major, minor and micro numbering scheme together with a descriptive string.
Add new member variables for this and initialize them correctly.
---
debian/changelog | 3 +++
src/pulsemanager.cpp | 4 +++-
src/pulsemanager.h | 2 ++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 5ae37b5..225233d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -216,6 +216,9 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
CWD on Linux.
- pulsemanager.cpp: fix some error messages by removing redundant
newlines.
+ - pulsemanager.{cpp,h}: some older PA versions used the major, minor and
+ micro numbering scheme together with a descriptive string. Add new
+ member variables for this and initialize them correctly.
-- X2Go Release Manager <git-admin at x2go.org> Mon, 19 Sep 2016 09:07:07 +0200
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 3f7256a..bdf7f62 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -37,7 +37,9 @@ PulseManager::PulseManager () : pulse_X2Go_ ("/.x2go/pulse"),
server_binary_ (QString ("")),
server_working_dir_ (QString ("")),
pulse_version_major_ (0),
- pulse_version_minor_ (0) {
+ pulse_version_minor_ (0),
+ pulse_version_micro_ (0),
+ pulse_version_misc_ ("") {
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 fb21992..52c4dfa 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -93,6 +93,8 @@ class PulseManager: public QObject {
QString server_working_dir_;
std::uint32_t pulse_version_major_;
std::uint32_t pulse_version_minor_;
+ std::uint32_t pulse_version_micro_;
+ QString pulse_version_misc_;
};
#ifdef NDEBUG_DEFINE
--
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