[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.8-37-gc0b9760

X2go dev team git-admin at x2go.org
Sat Dec 17 02:56:55 CET 2011 

The branch, master has been updated
       via  c0b97603f18c6d5555384c47cb88c18ba9bf660b (commit)
      from  e9cf74ecc5138a053ecc0bd1e078aa1208c11a3a (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 c0b97603f18c6d5555384c47cb88c18ba9bf660b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 17 02:56:50 2011 +0100

    revert session title renaming from server code, has been implemented in clients

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

Summary of changes:
 debian/changelog                                   |    4 -
 x2goserver-pyhoca/bin/x2gosessiontitle             |   74 --------------------
 x2goserver-pyhoca/man/man8/x2gosessiontitle.8      |   39 ----------
 .../share/x2gofeature.d/x2goserver-pyhoca.features |    1 -
 x2goserver/bin/x2gostartagent                      |    7 +--
 5 files changed, 1 insertions(+), 124 deletions(-)
 delete mode 100755 x2goserver-pyhoca/bin/x2gosessiontitle
 delete mode 100644 x2goserver-pyhoca/man/man8/x2gosessiontitle.8

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3c7785b..650ab8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,14 +4,10 @@ x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low
     - Fix for install stanzas in several Makefiles.
     - Give X2Go session windows a human readable title.
     - Desktop sharing: fix username of user who requests desktop sharing.
-    - Allow client-side setting of session window title (script:
-      x2gosessiontitle).
     - Fix x2gobasepath for Perl versions < 5.10.x.
     - Fix x2godbadmin for Perl versions < 5.10.x.
     - 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.
     - Call x2golistmounts with user privileges instead of using db_getmounts
       in x2goprint script.
   * Add psmisc package as dependency.
diff --git a/x2goserver-pyhoca/bin/x2gosessiontitle b/x2goserver-pyhoca/bin/x2gosessiontitle
deleted file mode 100755
index 7a76cd9..0000000
--- a/x2goserver-pyhoca/bin/x2gosessiontitle
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# Copyright (C) 2007-2011  Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-
-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
-
-SESSION_NAME=$1; shift
-X2GO_CMD=$1; shift
-X2GO_STYPE=$1; shift
-# only available if $X2GO_STYPE == S
-SHADOW_USER=$1; shift
-SHADOW_REQUSER=$1; shift
-SHADOW_MODE=$1; shift
-
-if [ "x${X2GO_CLIENTFEATURE_SET_SESSIONTITLE}" == "xenabled" ]; then
-
-	$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "$(basename $0) session title feature got enabled by client"
-
-	if [ "x${X2GO_SESSION_WINDOW_TITLE}" == "x" ]; then 
-
-		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
-
-			X2GO_SESSION_WINDOW_TITLE="${SESSION_WINDOW_TITLE}"
-
-		else
-			test -z ${X2GO_CMD} && X2GO_CMD="UNKNOWN"
-			X2GO_SESSION_WINDOW_TITLE="${X2GO_CMD} for ${USER}@${HOSTNAME}"
-		fi
-
-	fi
-
-	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''"
-
-else
-	X2GO_SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}"
-fi
-
-echo -n "$X2GO_SESSION_WINDOW_TITLE"
diff --git a/x2goserver-pyhoca/man/man8/x2gosessiontitle.8 b/x2goserver-pyhoca/man/man8/x2gosessiontitle.8
deleted file mode 100644
index 1271ad8..0000000
--- a/x2goserver-pyhoca/man/man8/x2gosessiontitle.8
+++ /dev/null
@@ -1,39 +0,0 @@
-'\" -*- coding: utf-8 -*-
-.if \n(.g .ds T< \\FC
-.if \n(.g .ds T> \\F[\n[.fam]]
-.de URL
-\\$2 \(la\\$1\(ra\\$3
-..
-.if \n(.g .mso www.tmac
-.TH x2gosessiontitle 8 "Nov 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)"
-.SH NAME
-x2gosessiontitle \- Render a custom session window title for X2Go sessions.
-.SH SYNOPSIS
-'nh
-.fi
-.ad l
-.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
-otherwise, nothing will happen.
-.PP
-When called from within \fBx2gostartagent\fR the \fBx2gosessiontitle\fR script checks if the
-environment variable $X2GO_FEATURE_SESSIONTITLE is set to ,,enabled''. 
-.PP
-If so, a custom session window title for the X2Go session window is generated. The script also
-allows the environment variable $X2GO_SESSION_WINDOW_TITLE to be set by the X2Go client that
-is launching the session and thus gives server-side support for custom X2Go session window names.
-.PP
-\fINOTE\fR: This feature at the moment (2011-11-30) only works with PyHoca client implementations. The
-native X2Go Client demands a session window title of the form: X2GO-<session_id>.
-.PP
-.SH RETURN VALUES
-\fBx2gosessiontitle\fR echoes the custom session window title to STDOUT (without line break at the end).
-Its exitcode is always equal to 0.
-.PP
-.SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
-(http://www.x2go.org).
diff --git a/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features
index 183aa7d..eb0dce4 100755
--- a/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features
+++ b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features
@@ -30,7 +30,6 @@ X2GO_FEATURE=$1
 case "$X2GO_FEATURE" in
 
     "X2GO_SET_KEYBOARD") echo "ok"; exit 0;;
-    "X2GO_SET_SESSIONTITLE") echo "ok"; exit 0;;
     *) exit -1;;
 
 esac
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index df72a70..2715551 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -238,12 +238,7 @@ fi
 # run x2goserver-extensions for pre-start
 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_NAME $X2GO_CMD $X2GO_STYPE $X2GO_TYPE $SHADOW_USER $SHADOW_REQUSER $SHADOW_MODE)
-} || {
-	SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}"
-}
+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).

More information about the x2go-commits mailing list