[pulseaudio] 01/01: Kill pulseaudio on session exit with kde too

[Felipe Sateler]

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

fsateler pushed a commit to branch master
in repository pulseaudio.

commit a4e5fce75f2df23d46cde7a0b2c3291e58a30c35
Author: Felipe Sateler <fsateler at debian.org>
Date:   Tue Apr 15 16:28:07 2014 -0300

    Kill pulseaudio on session exit with kde too
---
 debian/patches/0003-exit-with-X-session.patch | 28 +++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/debian/patches/0003-exit-with-X-session.patch b/debian/patches/0003-exit-with-X-session.patch
index 2f3165c..2450d12 100644
--- a/debian/patches/0003-exit-with-X-session.patch
+++ b/debian/patches/0003-exit-with-X-session.patch
@@ -1,5 +1,3 @@
-diff --git a/src/daemon/start-pulseaudio-x11.in b/src/daemon/start-pulseaudio-x11.in
-index 391a6d3..e65dd9f 100755
 --- a/src/daemon/start-pulseaudio-x11.in
 +++ b/src/daemon/start-pulseaudio-x11.in
 @@ -19,6 +19,13 @@
@@ -26,3 +24,29 @@ index 391a6d3..e65dd9f 100755
 +	/usr/bin/xprop -root -spy > /dev/null 2>&1 || true
 +	/usr/bin/pulseaudio --kill
 +fi &
+--- a/src/daemon/start-pulseaudio-kde.in
++++ b/src/daemon/start-pulseaudio-kde.in
+@@ -21,6 +21,13 @@ set -e
+ 
+ [ -z "$PULSE_SERVER" ]
+ 
++# check if pulseaudio has already been started by someone else
++if /usr/bin/pulseaudio --check; then
++    EXIT_WITH_X_SESSION=no
++else
++    EXIT_WITH_X_SESSION=yes
++fi
++
+ @PA_BINARY@ --start "$@"
+ 
+ if [ x"$DISPLAY" != x ] ; then
+@@ -28,3 +35,9 @@ if [ x"$DISPLAY" != x ] ; then
+     @PACTL_BINARY@ load-module module-device-manager "do_routing=1" > /dev/null
+ 
+ fi
++
++# fork and wait for X-session to end, then quit pulseaudio
++if [ "$EXIT_WITH_X_SESSION" = yes ]; then
++    /usr/bin/xprop -root -spy > /dev/null 2>&1 || true
++    /usr/bin/pulseaudio --kill
++fi &

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git