[X2Go-Commits] [x2goserver] 01/02: Set default value for clipboard to "both" in x2gostartagent and x2goresume-session.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.

commit a879af8842d2cb4b0521b4c2e1afe5f684b9a853
Author: Oleksandr Shneyder <o.shneyder at 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                  |    1 +
 x2goserver/bin/x2goresume-session |    2 ++
 x2goserver/bin/x2gostartagent     |    2 ++
 3 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 498a41a..72deb4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,6 +69,7 @@ x2goserver (4.0.1.16-0x2go1) UNRELEASED; urgency=low
     - Move session file to /tmp/.x2go-$USER. (Fixes: #523).
     - Fix x2gostartagent failures if kbd is not "auto". Remove comma at end of
       options file.
+    - Set default value for clipboard to "both" in x2gostartagent and x2goresume-session.
 
  -- Mike DePaulo <mikedep333 at gmail.com>  Thu, 23 Apr 2014 17:49:00 -0500
 
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 8f91aef..c06eea7 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -206,6 +206,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 f94d6c7..7293a0e 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -271,6 +271,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