summaryrefslogtreecommitdiff
path: root/extra/pulseaudio/pulseaudio.xinit
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2011-10-02 23:14:32 +0000
committerroot <root@rshg054.dnsready.net>2011-10-02 23:14:32 +0000
commitad84169d66d20378d28533c216b73c9a6646d6d7 (patch)
tree2746e102687e113dd81d632b51933b62ff458934 /extra/pulseaudio/pulseaudio.xinit
parent0f78806d775c4d46c649425fcb67964d53531db8 (diff)
Sun Oct 2 23:14:32 UTC 2011
Diffstat (limited to 'extra/pulseaudio/pulseaudio.xinit')
-rw-r--r--extra/pulseaudio/pulseaudio.xinit13
1 files changed, 9 insertions, 4 deletions
diff --git a/extra/pulseaudio/pulseaudio.xinit b/extra/pulseaudio/pulseaudio.xinit
index ca510e882..2d30c0943 100644
--- a/extra/pulseaudio/pulseaudio.xinit
+++ b/extra/pulseaudio/pulseaudio.xinit
@@ -1,7 +1,12 @@
-#!/bin/sh
+#!/bin/bash
-case "$SESSION" in
- GNOME|KDE*|xfce4) # PulseAudio is started via XDG Autostart
+case "$DESKTOP_SESSION" in
+ gnome|kde*|xfce*) # PulseAudio is started via XDG Autostart
+ ;;
+ *)
+ # Extra checks in case DESKTOP_SESSION is not set correctly
+ if [[ -z $KDE_FULL_SESSION && -z $GNOME_DESKTOP_SESSION_ID ]]; then
+ /usr/bin/start-pulseaudio-x11
+ fi
;;
- *) /usr/bin/start-pulseaudio-x11 ;;
esac