The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated via 82047923404f6b180002ec9dfa009c1022e17856 (commit) from d2ac0cf2f987699d35a4b4f37566f9d4804a95c2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ man/man1/pyhoca-gui.1 | 7 +++++-- pyhoca-gui | 4 ++-- pyhoca/wxgui/frontend.py | 12 ++++++------ 4 files changed, 16 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e5df2ed..8398714 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,9 @@ pyhoca-gui (0.4.0.0-0~x2go1) UNRELEASED; urgency=low manager. - Show ,,Start RDP sessions'' in menu if RDP (X2Go-proxied) has been selected as command. + - Give control of auto-starting and auto-resuming fully into the hands + of the session profiles. No extra cmdline options needed anymore to + activate auto-starting/-resuming of sessions. * /debian/control: + Thanks to Orion's patch in bug #91 we can drop many build dependencies. + Versioned Depend: on python-x2go (>= 0.4.0.0-0~). diff --git a/man/man1/pyhoca-gui.1 b/man/man1/pyhoca-gui.1 index 8f07e83..0d59829 100644 --- a/man/man1/pyhoca-gui.1 +++ b/man/man1/pyhoca-gui.1 @@ -101,13 +101,16 @@ Automatically add host key fingerprint to .ssh/known_hosts in case of "authentic Handle this option with care: Using it lessens the security/integrity of your SSH client setup. .TP \*(T<\fB\-\-start-on-connect\fR\*(T> -Start a session directly after authentication (only if no suspended sessions are available). +DEPRECATED: Start a session directly after authentication (only if no suspended sessions are available). This switch is now fully controlled from within +the session profiles. This option itself remains here for compatibility with older versions of \fBPyHoca-GUI\fR. .TP \*(T<\fB\-\-exit-on-disconnect\fR\*(T> Exit \fBpyhoca-gui\fR cleanly once a session has been disconnected. .TP \*(T<\fB\-\-resume-on-connect, \-\-resume-newest-on-connect\fR\*(T> -After authentication directly auto-resume the newest available running/suspended session. +DEPRECATED: After authentication directly auto-resume the newest available running/suspended session. This switch is now fully controlled from within +the session profiles, resuming the newest session is the hard-coded default. However, you can influence the resuming behaviour with the next two command line options. This option itself remains here +for compatibility with older versions of \fBPyHoca-GUI\fR. .TP \*(T<\fB\-\-resume-oldest-on-connect\fR\*(T> After authentication directly auto-resume the oldest available running/suspended session. diff --git a/pyhoca-gui b/pyhoca-gui index 9c54b38..0555dd6 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -207,9 +207,9 @@ x2go_gui_options = [ {'args':['--tray-icon-connecting'], 'default': None, 'metavar': '<your-logo-while-connecting>', 'help': 'define an alternative system tray icon file while connecting to a server (PNG files only, leave out file extension here, size 22x22 on Linux, 16x16 on Windows)', }, {'args':['--restricted-trayicon'], 'default': False, 'action': 'store_true', 'help': 'restricts session manager\'s main icon functionality to information window and application exit; on left-click only a minimal session menu is shown', }, {'args':['--add-to-known-hosts'], 'default': False, 'action': 'store_true', 'help': 'automatically add SSH host keys to the known_hosts files of the client-side user', }, - {'args':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'start a session directly after authentication if no session is currently running/suspended', }, + {'args':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'This is now the hard-coded default. start a session directly after authentication if no session is currently running/suspended', }, {'args':['--exit-on-disconnect'], 'default': False, 'action': 'store_true', 'help': 'exit the session manager after a server connection has died', }, - {'args':['--resume-newest-on-connect', '--resume-on-connect'], 'default': False, 'action': 'store_true', 'help': 'on connect auto-resume the newest suspended session', }, + {'args':['--resume-newest-on-connect', '--resume-on-connect'], 'default': False, 'action': 'store_true', 'help': 'This is now the hard-coded default. On connect auto-resume the newest suspended session', }, {'args':['--resume-oldest-on-connect'], 'default': False, 'action': 'store_true', 'help': 'on connect auto-resume the oldest suspended session', }, {'args':['--resume-all-on-connect'], 'default': False, 'action': 'store_true', 'help': 'auto-resume all suspended sessions on connect', }, {'args':['--disconnect-on-suspend'], 'default': False, 'action': 'store_true', 'help': 'disconnect a server if a session has been suspended', }, diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index f2d0cf1..42382f2 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -277,8 +277,8 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): # cmd line options self.add_to_known_hosts = self.args.add_to_known_hosts self.auto_connect = self.args.auto_connect - self.start_on_connect = self.args.start_on_connect - self.resume_newest_on_connect = self.args.resume_newest_on_connect + self.start_on_connect = True + self.resume_newest_on_connect = True self.resume_oldest_on_connect = self.args.resume_oldest_on_connect self.resume_all_on_connect = self.args.resume_all_on_connect self.exit_on_disconnect = self.args.exit_on_disconnect @@ -404,12 +404,12 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): """ if not self.get_session(session_uuid).published_applications: - if self.resume_newest_on_connect: - self._X2GoClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect, **kwargs) - elif self.resume_oldest_on_connect: + if self.resume_oldest_on_connect: self._X2GoClient__session_auto_start_or_resume(session_uuid, newest=False, oldest=True, start=self.start_on_connect, **kwargs) - elif self.resume_all_on_connect: + if self.resume_all_on_connect: self._X2GoClient__session_auto_start_or_resume(session_uuid, newest=False, all_suspended=True, start=self.start_on_connect, **kwargs) + elif self.resume_newest_on_connect: + self._X2GoClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect, **kwargs) def _exit_handler(self, *args): """\ hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).