This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit e125f82314aa53a4d6e68f779dc1282d9edc7d5f Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Tue Jul 22 11:55:36 2014 +0200 Set default value for clipboard to "both" in x2gostartagent and x2goresume-session. --- debian/changelog | 3 +++ x2goserver/bin/x2goresume-session | 2 ++ x2goserver/bin/x2gostartagent | 2 ++ 3 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6e2e971..727bdb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -116,6 +116,9 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low * New upstream version (4.1.0.0): - Use new script x2gopath in Perl::API. (Fixes: #86). + [ Oleksandr Shneyder ] + * Set default value for clipboard to "both" in x2gostartagent and x2goresume-session. + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 09 May 2014 13:06:24 +0200 x2goserver (4.0.1.16-0x2go1) UNRELEASED; urgency=low diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 925582f..8e594ad 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -239,6 +239,8 @@ fi if [ -n "$X2GO_CLIPBOARD" ] && [ -z "`echo $X2GO_CLIPBOARD | sed -re 's/(0|none|client|server|both|1)//'`" ]; then clipboard="clipboard=$X2GO_CLIPBOARD" +else + clipboard="clipboard=both" fi NEWOPTIONS=`echo "$OPTIONS" | sed -e "s/$LSTR/link=$X2GO_LINK/"\ diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 3354a46..489638d 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -295,6 +295,8 @@ fi if [ -n "$X2GO_CLIPBOARD" ] && [ -z "`echo $X2GO_CLIPBOARD | sed -re 's/(0|none|client|server|both|1)//'`" ]; then clipboard=",clipboard=$X2GO_CLIPBOARD" +else + clipboard=",clipboard=both" fi if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" == "auto" ];then -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git