[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ktorrent] /: Properly support x-scheme-handler/magnet mimetype, and drop old hard-coded magnet.prot
From:       Joris Guisson <joris.guisson () gmail ! com>
Date:       2014-11-08 11:37:16
Message-ID: E1Xn4KS-0005pN-SO () scm ! kde ! org
[Download RAW message or body]

Git commit f090d11e8837d944dedb40f873713abe4e15d4b4 by Joris Guisson.
Committed on 08/11/2014 at 11:35.
Pushed by guisson into branch 'master'.

Properly support x-scheme-handler/magnet mimetype, and drop old hard-coded magnet.protocol.

Patch from Rex Dieter

Review: 108648

M  +1    -0    ChangeLog
M  +0    -4    ktorrent/CMakeLists.txt
M  +1    -1    ktorrent/ktorrent.desktop
D  +0    -14   ktorrent/magnet.protocol

http://commits.kde.org/ktorrent/f090d11e8837d944dedb40f873713abe4e15d4b4

diff --git a/ChangeLog b/ChangeLog
index af27172..bd8dbeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@ Changes in 4.4:
 - Remove estimation algorithm option 
 - Fix double click on subdirectory not working in fileview (337457)
 - Drop support for importing KDE3 torrents
+- Support x-scheme-handler/magnet mimetype
 
 Changes in 4.3.2:
 - Backport ipfilter extraction fixes from master branch (315239)
diff --git a/ktorrent/CMakeLists.txt b/ktorrent/CMakeLists.txt
index 3d61cfd..3e64bc1 100644
--- a/ktorrent/CMakeLists.txt
+++ b/ktorrent/CMakeLists.txt
@@ -91,9 +91,5 @@ install(FILES ktorrentui.rc DESTINATION ${DATA_INSTALL_DIR}/ktorrent )
 install(FILES kttorrentactivityui.rc DESTINATION ${DATA_INSTALL_DIR}/ktorrent )
 install(FILES ktorrent.notifyrc DESTINATION ${DATA_INSTALL_DIR}/ktorrent )
 
-if (NOT ${ENABLE_KIO_MAGNET})
-    install(FILES magnet.protocol  DESTINATION  ${SERVICES_INSTALL_DIR} )
-endif (NOT ${ENABLE_KIO_MAGNET})
-    
 
 add_subdirectory(icons)
diff --git a/ktorrent/ktorrent.desktop b/ktorrent/ktorrent.desktop
index d326f63..dff843f 100755
--- a/ktorrent/ktorrent.desktop
+++ b/ktorrent/ktorrent.desktop
@@ -119,7 +119,7 @@ Exec=ktorrent %i -caption %c %u
 Icon=ktorrent
 Type=Application
 X-DocPath=ktorrent/index.html
-MimeType=application/x-bittorrent;application/x-torrent;
+MimeType=application/x-bittorrent;application/x-torrent;x-scheme-handler/magnet;
 X-DBUS-StartupType=Unique
 X-DBUS-ServiceName=org.ktorrent.ktorrent
 Comment=A BitTorrent program for KDE
diff --git a/ktorrent/magnet.protocol b/ktorrent/magnet.protocol
deleted file mode 100644
index 7507ce2..0000000
--- a/ktorrent/magnet.protocol
+++ /dev/null
@@ -1,14 +0,0 @@
-[Protocol]
-exec=ktorrent "%u"
-protocol=magnet
-Icon=kt-magnet
-input=none
-output=none
-helper=true
-listing=
-reading=false
-writing=false
-makedir=false
-deleting=false
-URIMode=rawuri
-Class=:internet
[prev in list] [next in list] [prev in thread] [next in thread]