x2goserver.git - master (branch) updated: 3.0.99.8-13-gbf3d7a5 - x2go-commits

25 Nov 2011

The branch, master has been updated
       via  bf3d7a5a35acdf42206e6b723ec90222e1cb70f6 (commit)
      from  97506f8090c0fcb0bd641a368029342f5e1e4b9e (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 bf3d7a5a35acdf42206e6b723ec90222e1cb70f6
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Fri Nov 25 10:37:18 2011 +0100

    Give X2Go session windows a human readable title.

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

Summary of changes:
 debian/changelog              |    3 ++-
 x2goserver/bin/x2gostartagent |   16 ++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 3c5f5e9..69375ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low
 
   * New upstream version (3.0.99.9):
     - Fix for install stanzas in several Makefiles.
+    - Give X2Go session windows a human readable title.
 
- -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Mon, 21 Nov 2011 21:09:07 +0100
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 25 Nov 2011 10:36:28 +0100
 
 x2goserver (3.0.99.8-0~x2go1) unstable; urgency=low
 
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 32d16b8..81cb664 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -228,9 +228,21 @@ fi
 x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-start || true
 
 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 "X2GO-${SESSION_NAME}"  ${NX_AGENT} 2>${SESSION_DIR}/session.log &
+	SESSION_WINDOW_TITLE="Shadow Desktop on ${HOSTNAME} shared by ${SHADOW_USER}, "
+	if [ "x${SHADOW_MODE}" == "x1" ]; then
+		SESSION_WINDOW_TITLE+="granting full access to ${USER}"
+	else
+		SESSION_WINDOW_TITLE+="granting view-only access to ${USER}"
+	fi
+	SESSION_WINDOW_TITLE+=" (X2GO-${SESSION_NAME})"
+	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
-	LD_LIBRARY_PATH=$X2GO_LIB x2goagent $X2GODPIOPTION_ $XDMCPOPT  -$SESSION_TYPE -auth ~/.Xauthority -geometry ${X2GO_GEOMETRY} -name "X2GO-${SESSION_NAME}"  ${NX_AGENT} 2>${SESSION_DIR}/session.log &
+	if [ -n "$X2GO_CMD" ]; then
+		SESSION_WINDOW_TITLE="${X2GO_CMD} for ${USER}@${HOSTNAME} (X2GO-${SESSION_NAME})"
+	else
+		SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}"
+	fi
+	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=$!


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

    