[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-7-g48ccfe5

[X2Go dev team]

The branch, master has been updated
       via  48ccfe5706cb5192fc0a4a83938db827b5565ee0 (commit)
      from  6b41cef9e10da4dee9f16c36f273c3d723208953 (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 48ccfe5706cb5192fc0a4a83938db827b5565ee0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Sep 5 22:18:30 2012 +0200

    Wrap padsp around rdesktop calls if pulse is used as audio protocol.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 309adc1..cb2ec8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x2goserver (3.1.1.4-0~x2go1) UNRELEASED; urgency=low
   [ Mike Gabriel ]
   * New upstream version (3.1.1.4):
     - Fix x2gosessionlimit script.
+    - Wrap padsp around rdesktop calls if pulse is used as audio protocol.
   * /debian/control:
     + Fix x2goagent dependency.
 
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 6e62709..1fb14bd 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -179,11 +179,13 @@ if [ "$cmd" == "TERMINAL" ]; then
 fi
 
 EXEC=`which $cmd`
+EXEC_WRAPPER=""
 
 BNAME=`basename "$EXEC"`
 if [ "$BNAME" == "rdesktop" ]
 then
 	IMEXIT="true"
+	which padsp >/dev/null && EXEC_WRAPPER="padsp"
 fi
 
 if [ "$X2GO_SESS_TYPE" == "P" ]
@@ -208,7 +210,7 @@ if [ "$EXEC" != "" ] && [ -x $EXEC ]; then
 		STARTUP="$STARTUP" /etc/x2go/Xsession
 	} || {
 		$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command \"$cmd$args\"..."
-		$cmd$args
+		$EXEC_WRAPPER $cmd$args
 	}
 
 	#### some applications can quit immediately, we will wait here as long as x2goagent exists


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