[X2Go-Commits] [x2goclient] 103/126: pulsemanager.{cpp, h}: add server_args_, server_binary_ and server_working_dir_ class variables.

git-admin at x2go.org git-admin at x2go.org
Wed Dec 2 23:19:50 CET 2015


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

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

commit fce602dabecbb66557fec39815b090817f935f99
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Oct 30 02:56:30 2015 +0100

    pulsemanager.{cpp,h}: add server_args_, server_binary_ and server_working_dir_ class variables.
---
 debian/changelog     |    2 ++
 src/pulsemanager.cpp |    3 +++
 src/pulsemanager.h   |    3 +++
 3 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 090b36f..0aa7c1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -184,6 +184,8 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
     - pulsemanager.{cpp,h}: rename relaunch () to restart ().
     - pulsemanager.cpp: reformat only.
     - pulsemanager.{cpp,h}: fixup preprocessor usage.
+    - pulsemanager.{cpp,h}: add server_args_, server_binary_ and
+      server_working_dir_ class variables.
 
   [ Oleksandr Shneyder ]
   * New upstream release (4.0.5.1):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 9c31cca..a46ab11 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -30,6 +30,9 @@ PulseManager::PulseManager () : pulse_X2Go_ ("/.x2go/pulse"),
                                 state_ (QProcess::NotRunning),
                                 pulse_server_ (NULL),
                                 app_dir_ (QApplication::applicationDirPath ()),
+                                server_args_ (QStringList ()),
+                                server_binary_ (QString ("")),
+                                server_working_dir (QString ("")),
                                 pulse_version_major_ (0),
                                 pulse_version_minor_ (0) {
   pulse_dir_ = QDir (QDir::homePath ());
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index 020556a..99b3d4a 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -85,6 +85,9 @@ class PulseManager: public QObject {
     std::uint16_t esd_port_;
     QProcess::ProcessState state_;
     QString app_dir_;
+    QStringList server_args_;
+    QString server_binary_;
+    QString server_working_dir_;
     std::uint32_t pulse_version_major_;
     std::uint32_t pulse_version_minor_;
 };

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