[vlc-commits] Add support network URI schemes for KDE

Rémi Denis-Courmont git at videolan.org
Wed May 18 18:00:54 CEST 2011


vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed May 18 17:45:22 2011 +0300| [2dc88a48853c2e34d89ea2e29c7fd1ec44fa1cd6] | committer: Rémi Denis-Courmont

Add support network URI schemes for KDE

Warning: If credentials are required, we are going to have to assume
that KDE passes them in the URL. I have not tested if this was the case
or not. This is potentially nasty for those protocols whereby VLC does
not currently implement any login dialog. But ultimately, I would
consider this a KDE bug (if applicable).
(cherry picked from commit 08633adfd8fbff142848d6f80d18189814fa9c63)

Conflicts:

	share/vlc.desktop

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

 share/vlc.desktop |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/share/vlc.desktop b/share/vlc.desktop
index 558ea18..11186ae 100644
--- a/share/vlc.desktop
+++ b/share/vlc.desktop
@@ -54,3 +54,4 @@ Terminal=false
 Type=Application
 Categories=AudioVideo;Player;
 MimeType=video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;application/ogg;application/x-ogg;application/x-matroska;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;video/vnd.rn-realvideo;audio/x-pn-realaudio-plugin;application/x-extension-mp4;audio/mp4;video/mp4;video/mp4v-es;x-content/video-vcd;x-content/video-svcd;x-content/video-dvd;x-content/audio-cdda;x-content/audio-player;video/x-flv;
+X-KDE-Protocols=ftp,http,https,mms,rtmp,rtsp,sftp,smb



More information about the vlc-commits mailing list