[vlc-commits] commit: Fix for KDE device actions (Lari Natri )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Lari Natri <lari.natri at gmail.com> | Mon Nov 22 03:57:59 2010 +0200| [b9676bdf0353fb11d5c0bfa500b6aa9dab408a48] | committer: Rémi Denis-Courmont 

Fix for KDE device actions

This tiny patch enables opening of VideoCD/AudioCD/DVD discs with VLC in KDE when inserted, which was broken before.

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
(cherry picked from commit 99ebae0c04aa2ce0b3085fbba78f4245c713d9c2)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=b9676bdf0353fb11d5c0bfa500b6aa9dab408a48
---

 share/solid/vlc-opencda.desktop |    2 +-
 share/solid/vlc-opendvd.desktop |    4 ++--
 share/solid/vlc-openvcd.desktop |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/share/solid/vlc-opencda.desktop b/share/solid/vlc-opencda.desktop
index 4bdd52a..866e85f 100644
--- a/share/solid/vlc-opencda.desktop
+++ b/share/solid/vlc-opencda.desktop
@@ -5,6 +5,6 @@ Actions=open;
 
 [Desktop Action open]
 Name=Open with VLC media player
-Exec=vlc cdda://
+Exec=vlc cdda://%d
 Icon=vlc
 
diff --git a/share/solid/vlc-opendvd.desktop b/share/solid/vlc-opendvd.desktop
index e86fa40..620a396 100644
--- a/share/solid/vlc-opendvd.desktop
+++ b/share/solid/vlc-opendvd.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent & 'VideoDvd' ]
+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'Data|VideoDvd' ]
 Type=Service
 Actions=open;
 
 [Desktop Action open]
 Name=Open with VLC media player
-Exec=vlc dvd://
+Exec=vlc dvd://%d
 Icon=vlc
 
diff --git a/share/solid/vlc-openvcd.desktop b/share/solid/vlc-openvcd.desktop
index 4b75c7b..2965ea5 100644
--- a/share/solid/vlc-openvcd.desktop
+++ b/share/solid/vlc-openvcd.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent & 'VideoCd|SuperVideoCd' ]
+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent == 'VideoCd|SuperVideoCd' ]
 Type=Service
 Actions=open;
 
 [Desktop Action open]
 Name=Open with VLC media player
-Exec=vlc vcd://
+Exec=vlc vcd://%d
 Icon=vlc