[X2Go-Commits] [x2goclient] 92/94: Terminate shared desktop sessions of Ctrl-C (instead of suspending them.

[git-admin at x2go.org]

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

x2go pushed a commit to annotated tag 0.1.4.0
in repository x2goclient.

commit 7d859c5a132df3f94245ccafad69406e1e662080
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jun 24 17:08:54 2011 +0200

    Terminate shared desktop sessions of Ctrl-C (instead of  suspending them.
---
 debian/changelog       |  6 ++++--
 pyhoca/cli/frontend.py | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2882c60c..af0b49dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-pyhoca-cli (0.1.4.0-0~x2go3) UNRELEASED; urgency=low
+pyhoca-cli (0.1.4.0-0~x2go4) UNRELEASED; urgency=low
 
   * New upstream version (0.1.4.0):
     - Add X2go desktop sharing support.
+    - Terminate shared desktop sessions of Ctrl-C (instead of 
+      suspending them.
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 13 Jun 2011 23:24:37 +0200
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 24 Jun 2011 17:08:12 +0200
 
 pyhoca-cli (0.1.3.3-0~x2go2) unstable; urgency=low
 
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 6656cb18..8b58146d 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -398,11 +398,17 @@ class PyHocaCLI(x2go.X2goClient):
                         self._pyhoca_logger("X2go session %s has been moved to a different screen" % session_name, loglevel=x2go.loglevel_NOTICE, )
 
                 except KeyboardInterrupt:
-                    self._pyhoca_logger("Suspending X2go session %s" % session_name, loglevel=x2go.loglevel_INFO, )
-                    self._X2goClient__suspend_session(self.x2go_session_hash)
-                    # giving nxproxy's SSH tunnel some time to settle
-                    time.sleep(2)
-                    self._pyhoca_logger("X2go session %s has been suspended" % session_name, loglevel=x2go.loglevel_NOTICE, )
+                    if self.args.share_desktop:
+                        self._pyhoca_logger("Terminating X2go shared desktop session %s" % session_name, loglevel=x2go.loglevel_INFO, )
+                        self._X2goClient__terminate_session(self.x2go_session_hash)
+                        time.sleep(2)
+                        self._pyhoca_logger("X2go session %s has been terminated" % session_name, loglevel=x2go.loglevel_NOTICE, )
+                    else:
+                        self._pyhoca_logger("Suspending X2go session %s" % session_name, loglevel=x2go.loglevel_INFO, )
+                        self._X2goClient__suspend_session(self.x2go_session_hash)
+                        # giving nxproxy's SSH tunnel some time to settle
+                        time.sleep(2)
+                        self._pyhoca_logger("X2go session %s has been suspended" % session_name, loglevel=x2go.loglevel_NOTICE, )
 
         except x2go.X2goSessionException, e:
             self._pyhoca_logger("X2goSessionException occured:", loglevel=x2go.loglevel_ERROR)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git