x2goserver.git - master (branch) updated: 3.0.99.8-20-gf21aa45 - x2go-commits

30 Nov 2011

The branch, master has been updated
       via  f21aa45a5759d2d167050e069a829e615ceb865d (commit)
      from  42323861f27f8ffd215009765e61b1312707a58c (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 f21aa45a5759d2d167050e069a829e615ceb865d
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Wed Nov 30 09:26:17 2011 +0100

    improve session window renaming from client side

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

Summary of changes:
 x2goserver/bin/x2gostartagent |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

The diff of changes is:

diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index a416903..5ad46fd 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -250,7 +250,12 @@ if  [ "$X2GO_STYPE" == "S" ]; then
 	fi
 	SESSION_WINDOW_TITLE+=" (X2GO-${SESSION_NAME})"
 
-	test -z "${X2GO_SESSION_WINDOW_TITLE}" && X2GO_SESSION_WINDOW_TITLE="${SESSION_WINDOW_TITLE}"
+	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 &
 else
 	if [ -n "$X2GO_CMD" ]; then
@@ -258,7 +263,12 @@ else
 	else
 		SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}"
 	fi
-	test -z ${X2GO_SESSION_WINDOW_TITLE} && X2GO_SESSION_WINDOW_TITLE=${SESSION_WINDOW_TITLE}
+	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 &
 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).

    