[X2Go-Commits] [x2goclient] 01/01: add "--no-autoresume" parameter.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goclient.

commit 80f9632dab86d3218bfab703888a14c64e477c82
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Wed Jun 15 16:35:37 2016 +0200

    add "--no-autoresume" parameter.
---
 debian/changelog     |    1 +
 src/help.cpp         |    1 +
 src/onmainwindow.cpp |    9 ++++++++-
 src/onmainwindow.h   |    1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 40384c8..59298e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,6 +62,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   [ Oleksandr Shneyder ]
   * New upstream release (4.0.5.2):
     - reset session data in broker config.
+    - add "--no-autoresume" parameter.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 24 Mar 2016 23:04:42 +0100
 
diff --git a/src/help.cpp b/src/help.cpp
index 775154b..a708d81 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -110,6 +110,7 @@ help::params_t help::build_params () {
   ADD_OPT ("--debug", QT_TRANSLATE_NOOP ("Help", "Enables extensive debug output to the console." NEWLINE
                                          "On Windows, also enables PulseAudio logging to a file under \".x2go/pulse\" & cygwin sshd logging to a file under \".x2go/sshLogs\" directory, both under the USERPROFILE directory." NEWLINE
                                          "The logs are not deleted when X2Go Client terminates."));
+  ADD_OPT ("--no-autoresume", QT_TRANSLATE_NOOP ("Help", "Do not resume sessions automatically."));
   ADD_OPT ("--no-menu", QT_TRANSLATE_NOOP ("Help", "Hides menu bar."));
   ADD_OPT ("--no-session-edit", QT_TRANSLATE_NOOP ("Help", "Disables session editing."));
   ADD_OPT ("--maximize", QT_TRANSLATE_NOOP ("Help", "Starts maximized."));
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 01c1b1f..357e922 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -63,6 +63,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
 
     setFocusPolicy ( Qt::NoFocus );
     installTranslator();
+    autoresume=true;
     cleanAllFiles=false;
     drawMenu=true;
     usePGPCard=false;
@@ -3677,7 +3678,7 @@ void ONMainWindow::slotListSessions ( bool result,QString output,
             /* Check getSessionFromString for what this "invalid" string means. */
             if ((s.agentPid != "invalid") && (s.status == "S")
                 && (isColorDepthOk (wd.depth (), s.colorDepth))
-                && (s.command == selectedCommand))
+                && (s.command == selectedCommand)&&autoresume)
                 resumeSession ( s );
             else
             {
@@ -6918,6 +6919,12 @@ bool ONMainWindow::parseParameter ( QString param )
         return true;
     }
 
+    if (param == "--no-autoresume")
+    {
+        autoresume=false;
+        return true;
+    }
+
     if ( param == "--portable" )
     {
         ONMainWindow::portable=true;
diff --git a/src/onmainwindow.h b/src/onmainwindow.h
index bc70bb1..344f7d1 100644
--- a/src/onmainwindow.h
+++ b/src/onmainwindow.h
@@ -613,6 +613,7 @@ private:
     bool defaultXinerama;
     bool cardStarted;
     bool defaultSetKbd;
+    bool autoresume;
     bool showExport;
     bool usePGPCard;
     bool miniMode;

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git