From 0b5f80303bbec9c0cae23f1b0bcbf9af83cf4703 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <cguthrie@mandriva.org>
Date: Mon, 8 Jun 2009 22:02:26 +0100
Subject: [PATCH 505/505] Do not start pulseaudio daemon if PULSE_SERVER directs pulse elsewhere.

---
 src/daemon/start-pulseaudio-x11.in |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/daemon/start-pulseaudio-x11.in b/src/daemon/start-pulseaudio-x11.in
index 8ec6f3d..4edb981 100755
--- a/src/daemon/start-pulseaudio-x11.in
+++ b/src/daemon/start-pulseaudio-x11.in
@@ -33,6 +33,9 @@ if [ "$PULSE_SERVER_TYPE" != "personal" ]; then
   echo "Pulseaudio startup disabled due to configuration" >&2
 else
 
+# Exit without running pulseaudio daemon if this is a remote desktop session
+[ -n "$PULSE_SERVER" ] && exit 0
+
 @PA_BINARY@ --start ${PULSE_ARGS} "$@"
 
 # End Mandriva customisations (except for the "fi" below)
-- 
1.6.3.2