The branch, twofactorauth has been updated via 1dd252e00d59e41021fe98644ade03b4444f3d81 (commit) from 5d7ba13394f2d5b51ed460b3820e955122f162a7 (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: man/pyhoca-gui.1 | 3 ++- pyhoca-gui | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/man/pyhoca-gui.1 b/man/pyhoca-gui.1 index 39c3d8e..64d5f9c 100644 --- a/man/pyhoca-gui.1 +++ b/man/pyhoca-gui.1 @@ -68,7 +68,8 @@ session profile names to this option. Show descriptive meta information on session profiles in menus (NOTE: this makes menus appear a bit more sluggish, use it mostly for debugging). .TP \*(T<\fB\-\-hide-trayicon\fR\*(T> -Hide \fBpyhoca-gui\fR's main icon in the notification area / system tray. +Hide \fBpyhoca-gui\fR's main session manager icon that is normally shown in the notification area / system tray. Note: With a hidden system tray icon +you cannot control session states with \fBpyhoca-gui\fR interactively. All session control has to be performed by command-line options. .TP \*(T<\fB\-\-auto-connect\fR\*(T> Connect sessions via SSH public key authentication on application startup, if possible. diff --git a/pyhoca-gui b/pyhoca-gui index f15cda5..cf621e6 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -170,7 +170,7 @@ x2go_gui_options = [ {'args':['-P','--session-profile'], 'default': None, 'help': 'directly connect to a session profile', }, {'args':['--auto-connect'], 'default': False, 'action': 'store_true', 'help': 'connect sessions via SSH pubkey authentication if possible', }, {'args':['--show-profile-metatypes'], 'default': False, 'action': 'store_true', 'help': 'show descriptive meta information on session profiles in menus (NOTE: this makes menus appear a bit more sluggish, use it mostly for debugging)', }, - {'args':['--hide-trayicon'], 'default': False, 'action': 'store_true', 'help': 'hide application\'s main icon in the notification area / system tray', }, + {'args':['--hide-trayicon'], 'default': False, 'action': 'store_true', 'help': 'hide session manager\'s main icon that is normally shown in the notification area / system tray', }, {'args':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'start a session directly after authentication', }, {'args':['--resume-newest-on-connect', '--resume-on-connect'], 'default': False, 'action': 'store_true', 'help': ' 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', }, @@ -198,9 +198,9 @@ backend_options = [ if _X2GOCLIENT_OS == 'Windows': contrib_options = [ - {'args':['--start-xserver'], 'default': False, 'action': 'store_true', 'help': 'start the XServer before starting PyHoca-GUI, detect best XServer automatically, if more than one XServer is installed on your system', }, + {'args':['--start-xserver'], 'default': False, 'action': 'store_true', 'help': 'start the XServer before starting the session manager application, detect best XServer automatically, if more than one XServer is installed on your system', }, {'args':['-X', '--preferred-xserver'], 'default': None, 'metavar': 'XSERVER', 'choices': _known_xservers, 'help': 'start either of the currently supported XServers: %s -- make sure your preferred XServer is installed on your system' % _known_xservers, }, - {'args':['--start-pulseaudio'], 'default': False, 'action': 'store_true', 'help': 'start the PulseAudio server before starting PyHoca-GUI', }, + {'args':['--start-pulseaudio'], 'default': False, 'action': 'store_true', 'help': 'start the PulseAudio server before starting the session manager application', }, ] portable_options = [ 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)).