daemon: Drop KDE-specific loading of module-device-manager
authorNicolas Fella <nicolas.fella@gmx.de>
Fri, 30 Aug 2019 11:07:52 +0000 (11:07 +0000)
committerArun Raghavan <arun@arunraghavan.net>
Fri, 30 Aug 2019 11:07:52 +0000 (11:07 +0000)
Newer versions of Plasma no longer use this module, and the consensus
seems to be that module-switch-on-connect works better for most cases.

Fixes: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/509

src/daemon/start-pulseaudio-x11.in

index 16e46b1..1b5f429 100755 (executable)
@@ -23,7 +23,10 @@ if [ x"$DISPLAY" != x ] ; then
     @PACTL_BINARY@ load-module module-x11-cork-request "display=$DISPLAY" > /dev/null
 
     if [ x"$KDE_FULL_SESSION" = x"true" ]; then
-       @PACTL_BINARY@ load-module module-device-manager "do_routing=1" > /dev/null
+        plasmaversion=`grep "X-KDE-PluginInfo-Version" $DESKTOP_SESSION.desktop | cut -d "=" -f2 | cut -d "." -f1,2 | tr -d "."`
+        if [ "$plasmaversion" -lt "517" ]; then
+            @PACTL_BINARY@ load-module module-device-manager "do_routing=1" > /dev/null
+        fi
     fi
 
     if [ x"$SESSION_MANAGER" != x ] ; then