[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-11-g0c3542c

[X2Go dev team]

The branch, master has been updated
       via  0c3542c4b6710d97ad11f182e0ec8c0f5198b9e4 (commit)
       via  452498574b305425ec8a2e81b82ea86e4c5f67d4 (commit)
      from  2b68ff4432efb0f7058da0e4c8c3f2dfb446d459 (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 0c3542c4b6710d97ad11f182e0ec8c0f5198b9e4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Sep 6 09:22:32 2012 +0200

    use if clauses instead of ampersand shell constructions

commit 452498574b305425ec8a2e81b82ea86e4c5f67d4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Sep 6 09:21:23 2012 +0200

    Proxy X2Go client-side shares into remote desktop session.

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

Summary of changes:
 debian/changelog              |    1 +
 x2goserver/bin/x2goruncommand |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 50a2f5a..462dee4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x2goserver (3.1.1.4-0~x2go1) UNRELEASED; urgency=low
     - Fix x2gosessionlimit script.
     - Wrap padsp around rdesktop calls if pulse is used as audio protocol.
     - Add option ,,-r sound:local'' to rdesktop calls if pulse is enabled.
+    - Proxy X2Go client-side shares into remote desktop session.
   * /debian/control:
     + Fix x2goagent dependency.
     + Add rdesktop and pulseaudio-utils to Suggests.
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 93e731f..7be8039 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -185,10 +185,13 @@ BNAME=`basename "$EXEC"`
 if [ "$BNAME" == "rdesktop" ]
 then
 	IMEXIT="true"
-	which padsp >/dev/null && {
+	if which padsp >/dev/null; then
 		EXEC_WRAPPER="padsp"
 		args=" -r sound:local"
-	}
+	fi
+	if [ -d "$HOME/media" ]; then
+		args+=" -r disk:X2GoMedia=$HOME/media"
+	fi
 fi
 
 if [ "$X2GO_SESS_TYPE" == "P" ]


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