[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-8-gdf13257

[X2Go dev team]

The branch, master has been updated
       via  df13257d3fe83b4e12f9117f39e82b05276c44a1 (commit)
      from  48ccfe5706cb5192fc0a4a83938db827b5565ee0 (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 df13257d3fe83b4e12f9117f39e82b05276c44a1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Sep 6 09:00:13 2012 +0200

    Add option ,,-r sound:local'' to rdesktop calls if pulse is enabled.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index cb2ec8e..8dae37b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ x2goserver (3.1.1.4-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (3.1.1.4):
     - 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.
   * /debian/control:
     + Fix x2goagent dependency.
 
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 1fb14bd..93e731f 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -185,7 +185,10 @@ BNAME=`basename "$EXEC"`
 if [ "$BNAME" == "rdesktop" ]
 then
 	IMEXIT="true"
-	which padsp >/dev/null && EXEC_WRAPPER="padsp"
+	which padsp >/dev/null && {
+		EXEC_WRAPPER="padsp"
+		args=" -r sound:local"
+	}
 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).