The branch, master has been updated via 2f7093934874c7ea5c02258efba24654ba855edb (commit) from 50cf94a3d3f9eb433764448b4c1235c7d520db82 (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 2f7093934874c7ea5c02258efba24654ba855edb Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Nov 30 13:56:30 2011 +0100 Use cmd line parameters when calling x2gosessiontitle. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver-pyhoca/bin/x2gosessiontitle | 10 ++++++++++ x2goserver-pyhoca/man/man8/x2gosessiontitle.8 | 4 +++- x2goserver/bin/x2gostartagent | 6 +++++- 4 files changed, 19 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cb481e2..9ba170b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low - Remove x2gosetkeyboard from x2goserver-extensions package. - Re-add x2gosetkeyboard via new subproject x2goserver-pyhoca. - Add man page for x2gosessiontitle. + - Use cmd line parameters when calling x2gosessiontitle. * Add psmisc package as dependency. * Add new binary package to x2goserver source: x2goserver-pyhoca. * x2goserver package suggests x2goserver-pyhoca. diff --git a/x2goserver-pyhoca/bin/x2gosessiontitle b/x2goserver-pyhoca/bin/x2gosessiontitle index c6d4111..9933b3e 100755 --- a/x2goserver-pyhoca/bin/x2gosessiontitle +++ b/x2goserver-pyhoca/bin/x2gosessiontitle @@ -29,6 +29,16 @@ test -n $X2GO_SESSION && exit 0 # do nothing if called from some non-x2gostartagent context... test -z $SESSION_NAME && exit 0 +SESSION_NAME=$1; shift +X2GO_CMD=$1; shift +X2GO_STYPE=$1; shift +# X2GO_TYPE is not used yet... +X2GO_TYPE=$1; shift +# only available if $X2GO_STYPE == S +SHADOW_USER=$1; shift +SHADOW_REQUSER=$1; shift +SHADOW_MODE=$1; shift + if [ "x$X2GO_FEATURE_SESSIONTITLE" == "xenabled" ]; then if [ -z "${X2GO_SESSION_WINDOW_TITLE}" ] && [ -n "$X2GO_CMD" ]; then diff --git a/x2goserver-pyhoca/man/man8/x2gosessiontitle.8 b/x2goserver-pyhoca/man/man8/x2gosessiontitle.8 index 9c7c603..1271ad8 100644 --- a/x2goserver-pyhoca/man/man8/x2gosessiontitle.8 +++ b/x2goserver-pyhoca/man/man8/x2gosessiontitle.8 @@ -12,7 +12,9 @@ x2gosessiontitle \- Render a custom session window title for X2Go sessions. 'nh .fi .ad l -x2gosessiontitle +.nf +x2gosessiontitle <session_id> <cmd> <session_type> <window_type> \\ + [<shadow_user> <shadow_requesting_user> <shadow_mode>] .SH DESCRIPTION \fBx2gosessiontitle\fR may only be called from within the \fBx2gostartagent\fR script. If called diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index ac80092..df72a70 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -239,7 +239,11 @@ fi x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-start || true # rename session window title if supported by server+client -x2gofeature X2GO_SET_SESSIONTITLE &>/dev/null && SESSION_WINDOW_TITLE=$(x2gosessiontitle) || SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" +x2gofeature X2GO_SET_SESSIONTITLE &>/dev/null && { + SESSION_WINDOW_TITLE=$(x2gosessiontitle $SESSION_NAME $X2GO_CMD $X2GO_STYPE $X2GO_TYPE $SHADOW_USER $SHADOW_REQUSER $SHADOW_MODE) +} || { + SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" +} if [ "$X2GO_STYPE" == "S" ]; then LD_LIBRARY_PATH=$X2GO_LIB x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth ~/.Xauthority -S -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).