This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.1 in repository x2goclient. commit 2f472c5de266e7b753ba7af4eb0af884f737c0c5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jul 5 21:23:16 2011 +0200 Fix for Ctrl-C comment when sharing a desktop. --- debian/changelog | 11 +++++++++-- pyhoca/cli/frontend.py | 5 ++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6e7903e7..fe2aae90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,17 @@ -pyhoca-cli (0.1.4.0-0~x2go2) UNRELEASED; urgency=low +pyhoca-cli (0.1.4.1-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (0.1.4.1): + - Fix for Ctrl-C comment when sharing a desktop. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 05 Jul 2011 21:22:32 +0200 + +pyhoca-cli (0.1.4.0-0~x2go2) unstable; urgency=low * Already prepare for new upstream version (0.1.4.1): - README/TODO update. * Depend on Python X2go 0.1.1.2. - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 04 Jul 2011 20:10:26 +0200 + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 05 Jul 2011 21:22:28 +0200 pyhoca-cli (0.1.4.0-0~x2go4) unstable; urgency=low diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 8b58146d..8931e3de 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -377,7 +377,10 @@ class PyHocaCLI(x2go.X2goClient): session_name = self._X2goClient__get_session_name(self.x2go_session_hash) self._pyhoca_logger("X2go session is now running, the X2go client's profile name is: %s" % profile_name, loglevel=x2go.loglevel_INFO, ) self._pyhoca_logger("X2go session name is: %s" % session_name, loglevel=x2go.loglevel_INFO, ) - self._pyhoca_logger("Press CTRL+C to suspend the running session...", loglevel=x2go.loglevel_NOTICE, ) + if self.args.share_desktop: + self._pyhoca_logger("Press CTRL+C to end desktop sharing for this session...", loglevel=x2go.loglevel_NOTICE, ) + else: + self._pyhoca_logger("Press CTRL+C to suspend the running session...", loglevel=x2go.loglevel_NOTICE, ) try: session_duration = 0 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git