[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99.8-34-gb8303b6

X2Go dev team git-admin at x2go.org
Fri Jan 3 20:52:49 CET 2014


The branch, build-baikal has been updated
       via  b8303b69146ea5c027f7dbd549c8ea708f790783 (commit)
      from  2f7093934874c7ea5c02258efba24654ba855edb (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:
 x2goserver-pyhoca/bin/x2gosessiontitle |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

The diff of changes is:
diff --git a/x2goserver-pyhoca/bin/x2gosessiontitle b/x2goserver-pyhoca/bin/x2gosessiontitle
index 9933b3e..7a76cd9 100755
--- a/x2goserver-pyhoca/bin/x2gosessiontitle
+++ b/x2goserver-pyhoca/bin/x2gosessiontitle
@@ -24,24 +24,21 @@ X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
 $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
 
 # do nothing if called from an established X2Go session...
-test -n $X2GO_SESSION && exit 0
-
-# do nothing if called from some non-x2gostartagent context...
-test -z $SESSION_NAME && exit 0
+#test -n $X2GO_SESSION && 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 [ "x${X2GO_CLIENTFEATURE_SET_SESSIONTITLE}" == "xenabled" ]; then
+
+	$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "$(basename $0) session title feature got enabled by client"
 
-	if [ -z "${X2GO_SESSION_WINDOW_TITLE}" ] && [ -n "$X2GO_CMD" ]; then 
+	if [ "x${X2GO_SESSION_WINDOW_TITLE}" == "x" ]; then 
 
 		if  [ "$X2GO_STYPE" == "S" ]; then
 
@@ -61,7 +58,8 @@ if [ "x$X2GO_FEATURE_SESSIONTITLE" == "xenabled" ]; then
 			X2GO_SESSION_WINDOW_TITLE="${SESSION_WINDOW_TITLE}"
 
 		else
-			SESSION_WINDOW_TITLE="${X2GO_CMD} for ${USER}@${HOSTNAME}"
+			test -z ${X2GO_CMD} && X2GO_CMD="UNKNOWN"
+			X2GO_SESSION_WINDOW_TITLE="${X2GO_CMD} for ${USER}@${HOSTNAME}"
 		fi
 
 	fi


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).




More information about the x2go-commits mailing list