The branch, master has been updated via b1b9489df66447dfb0c863804228a5ac5ca5092c (commit) via fda28cd78ed721cce9d0bf900ac96682f91b3700 (commit) from a6bbb96a2533efb7a31d77d6fe2693796cd9e87a (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 ----------------------------------------------------------------- commit b1b9489df66447dfb0c863804228a5ac5ca5092c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Nov 2 23:26:50 2012 +0100 old refresh session list if we actually fiddled around with running pubapp sessions commit fda28cd78ed721cce9d0bf900ac96682f91b3700 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Nov 2 23:25:54 2012 +0100 Revert "old refresh session list if we actually fiddled around with running pubapp sessions" This reverts commit a6bbb96a2533efb7a31d77d6fe2693796cd9e87a. ----------------------------------------------------------------------- Summary of changes: man/man1/pyhoca-gui.1 | 6 ------ pyhoca-gui | 1 - 2 files changed, 7 deletions(-) The diff of changes is: diff --git a/man/man1/pyhoca-gui.1 b/man/man1/pyhoca-gui.1 index 8ca7b2e..1f73aff 100644 --- a/man/man1/pyhoca-gui.1 +++ b/man/man1/pyhoca-gui.1 @@ -149,12 +149,6 @@ Give a custom position for the logon window, use negative values to position rel .TP \*(T<\fB\-\-published-applications-no-submenus\fR \fI<number>\fR\*(T> The number of published applications that will be rendered without submenus. -.TP -\*(T<\fB\-\-connection-timeout\fR \fI<secs>\fR\*(T> -Python X2Go (the X2Go backend in PyHoca-GUI) regularly pings the aliveness of each X2Go server that the -application is connected to. If these pings receive a connection timeout, Python X2Go interprets this as -a connection loss. The default connection timeout is 20 seconds. If this does not meet your requirements -you can scale the timeout value to your needs. .PP .SH BACKEND OPTIONS \fBpyhoca-gui\fR supports transparent use of different data backends. For configuration three backends are common: diff --git a/pyhoca-gui b/pyhoca-gui index 2f4a7aa..0486314 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -223,7 +223,6 @@ x2go_gui_options = [ {'args':['--display'], 'default': None, 'metavar': '<hostname>:<screennumber>', 'help': 'set the DISPLAY environment variable to <hostname>:<screennumber>', }, {'args':['--logon-window-position'], 'default': None, 'metavar': '<x-pos>x<y-pos>', 'help': 'give a custom position for the logon window, use negative values to position relative to right/bottom border', }, {'args':['--published-applications-no-submenus'], 'default': 10, 'metavar': '<number>', 'help': 'the number of published applications that will be rendered without submenus', }, - {'args':['--connection-timeout'], 'default': 20, 'metavar': '<secs>', 'help': 'timeout connection after <secs> seconds (default: 20)', }, ] if _X2GOCLIENT_OS == 'Windows': x2go_gui_options.append( 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)).