[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.8-22-g52e2775

[X2go dev team]

The branch, master has been updated
       via  52e277550101af3b80dc306ede67a5a9b94937ff (commit)
       via  8084d7edbc6a7efaf38debe468a1a7a25fd6d1eb (commit)
      from  f21aa45a5759d2d167050e069a829e615ceb865d (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 52e277550101af3b80dc306ede67a5a9b94937ff
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 30 12:58:22 2011 +0100

    revert latest session renaming changes and provide functionality via an x2gofeature

commit 8084d7edbc6a7efaf38debe468a1a7a25fd6d1eb
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 30 12:21:48 2011 +0100

    add syslog debug line that shows the value of

-----------------------------------------------------------------------

Summary of changes:
 x2goserver/bin/x2gostartagent |   42 ++++++++--------------------------------
 1 files changed, 9 insertions(+), 33 deletions(-)

The diff of changes is:
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 5ad46fd..60b9c96 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -29,7 +29,10 @@ SSH_PORT=30000 #First ssh port 30001
 
 X2GO_ROOT=${HOME}/.x2go
 REMOTE=localhost
+
 X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'`
+$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "client announced itself as ,,$X2GO_CLIENT''"
+
 X2GO_GEOMETRY=$1; shift
 X2GO_LINK=$1; shift
 X2GO_PACK=$1; shift
@@ -235,43 +238,16 @@ fi
 # run x2goserver-extensions for pre-start
 x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-start || true
 
-if  [ "$X2GO_STYPE" == "S" ]; then
-	if [ "x${SHADOW_MODE}" == "x1" ]; then
-		SHADOW_ACCESS="full"
-	else
-		SHADOW_ACCESS="view-only"
-	fi
-
-	SESSION_WINDOW_TITLE="Shadow Desktop on ${HOSTNAME} shared"
-	if [ "x${SHADOW_USER}" == "x${SHADREQ_USER}" ]; then
-		SESSION_WINDOW_TITLE+=" in ${SHADOW_ACCESS} mode by/with yourself"
-	else
-		SESSION_WINDOW_TITLE+=" by ${SHADOW_USER}, granting ${SHADOW_ACCESS} access to ${SHADREQ_USER}"
-	fi
-	SESSION_WINDOW_TITLE+=" (X2GO-${SESSION_NAME})"
+# rename session window title if supported by server+client
+x2gofeature X2GO_SET_SESSIONTITLE && SESSION_WINDOW_TITLE=$(x2gosessiontitle) || SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}"
 
-	test -z "${X2GO_SESSION_WINDOW_TITLE}" && { 
-		X2GO_SESSION_WINDOW_TITLE="${SESSION_WINDOW_TITLE}"
-	} || {
-		X2GO_SESSION_WINDOW_TITLE="${X2GO_SESSION_WINDOW_TITLE} (X2GO-${SESSION_NAME})"
-		$X2GO_LIB_PATH/x2gosyslog "$0" "info" "renaming session window title as requested by X2Go client to ,,$X2GO_SESSION_WINDOW_TITLE''"
-        }
-	LD_LIBRARY_PATH=$X2GO_LIB x2goagent $X2GODPIOPTION_  -$SESSION_TYPE -auth ~/.Xauthority -S -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${X2GO_SESSION_WINDOW_TITLE}"  ${NX_AGENT} 2>${SESSION_DIR}/session.log &
+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 &
 else
-	if [ -n "$X2GO_CMD" ]; then
-		SESSION_WINDOW_TITLE="${X2GO_CMD} for ${USER}@${HOSTNAME} (X2GO-${SESSION_NAME})"
-	else
-		SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}"
-	fi
-	test -z "${X2GO_SESSION_WINDOW_TITLE}" && { 
-		X2GO_SESSION_WINDOW_TITLE="${SESSION_WINDOW_TITLE}"
-	} || {
-		X2GO_SESSION_WINDOW_TITLE="${X2GO_SESSION_WINDOW_TITLE} (X2GO-${SESSION_NAME})"
-		$X2GO_LIB_PATH/x2gosyslog "$0" "info" "renaming session window title as requested by X2Go client to ,,$X2GO_SESSION_WINDOW_TITLE''"
-        }
-	LD_LIBRARY_PATH=$X2GO_LIB x2goagent $X2GODPIOPTION_ $XDMCPOPT  -$SESSION_TYPE -auth ~/.Xauthority -geometry ${X2GO_GEOMETRY} -name "${X2GO_SESSION_WINDOW_TITLE}"  ${NX_AGENT} 2>${SESSION_DIR}/session.log &
+	LD_LIBRARY_PATH=$X2GO_LIB x2goagent $X2GODPIOPTION_ $XDMCPOPT  -$SESSION_TYPE -auth ~/.Xauthority -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}"  ${NX_AGENT} 2>${SESSION_DIR}/session.log &
 fi
 
+
 X2GO_AGENT_PID=$!
 X2GO_AGENT_RETVAL=$?
 test $X2GO_AGENT_RETVAL && {


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