From fab1ea4289561a71cc4a607b6fbb205c4ad879c7 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 1 Jan 2023 02:42:24 +0200 Subject: [PATCH] generic: adjust to KIO protocol changes Signed-off-by: Ivailo Monev --- dolphin/src/search/filenamesearch.protocol | 2 -- dolphin/src/views/dolphinremoteencoding.cpp | 7 ++----- kioslave/camera/camera.protocol | 2 -- kioslave/desktop/desktop.protocol | 2 -- kioslave/floppy/floppy.protocol | 2 -- kioslave/mtp/mtp.protocol | 2 -- kioslave/network/ioslave/network.protocol | 3 --- kioslave/remote/remote.protocol | 2 -- kioslave/sftp/sftp.protocol | 2 -- kioslave/thumbnail/thumbnail.protocol | 2 -- kioslave/trash/trash.protocol | 2 -- 11 files changed, 2 insertions(+), 26 deletions(-) diff --git a/dolphin/src/search/filenamesearch.protocol b/dolphin/src/search/filenamesearch.protocol index 93bc1f1c..5722d1be 100644 --- a/dolphin/src/search/filenamesearch.protocol +++ b/dolphin/src/search/filenamesearch.protocol @@ -1,8 +1,6 @@ [Protocol] exec=kio_filenamesearch protocol=filenamesearch -input=none -output=filesystem listing=true reading=true writing=false diff --git a/dolphin/src/views/dolphinremoteencoding.cpp b/dolphin/src/views/dolphinremoteencoding.cpp index 699b9309..e8ba031d 100644 --- a/dolphin/src/views/dolphinremoteencoding.cpp +++ b/dolphin/src/views/dolphinremoteencoding.cpp @@ -79,11 +79,8 @@ void DolphinRemoteEncoding::slotAboutToOpenUrl() m_currentURL = m_actionHandler->currentView()->url(); if (m_currentURL.protocol() != oldURL.protocol()) { - // This plugin works on ftp, fish, etc. - // everything whose type is T_FILESYSTEM except for local files - if (!m_currentURL.isLocalFile() && - KProtocolManager::outputType(m_currentURL) == KProtocolInfo::T_FILESYSTEM) { - + // This works on ftp, sftp, etc. + if (!m_currentURL.isLocalFile() && KProtocolManager::isSourceProtocol(m_currentURL)) { m_menu->setEnabled(true); loadSettings(); } else { diff --git a/kioslave/camera/camera.protocol b/kioslave/camera/camera.protocol index 53bc54a2..736215ae 100644 --- a/kioslave/camera/camera.protocol +++ b/kioslave/camera/camera.protocol @@ -1,8 +1,6 @@ [Protocol] exec=kio_camera protocol=camera -input=none -output=filesystem listing=true reading=true writing=false diff --git a/kioslave/desktop/desktop.protocol b/kioslave/desktop/desktop.protocol index bc9af59c..409b1b6e 100644 --- a/kioslave/desktop/desktop.protocol +++ b/kioslave/desktop/desktop.protocol @@ -2,8 +2,6 @@ exec=kio_desktop protocol=desktop Icon=user-desktop -input=none -output=filesystem listing=true reading=true writing=true diff --git a/kioslave/floppy/floppy.protocol b/kioslave/floppy/floppy.protocol index 51b55fe9..9673afd3 100644 --- a/kioslave/floppy/floppy.protocol +++ b/kioslave/floppy/floppy.protocol @@ -1,8 +1,6 @@ [Protocol] exec=kio_floppy protocol=floppy -input=none -output=filesystem listing=true reading=true writing=true diff --git a/kioslave/mtp/mtp.protocol b/kioslave/mtp/mtp.protocol index fe8bf7f6..a528ccc6 100644 --- a/kioslave/mtp/mtp.protocol +++ b/kioslave/mtp/mtp.protocol @@ -1,8 +1,6 @@ [Protocol] exec=kio_mtp protocol=mtp -input=none -output=filesystem listing=true reading=true writing=true diff --git a/kioslave/network/ioslave/network.protocol b/kioslave/network/ioslave/network.protocol index 5bc60862..d2e314c9 100644 --- a/kioslave/network/ioslave/network.protocol +++ b/kioslave/network/ioslave/network.protocol @@ -1,9 +1,6 @@ [Protocol] protocol=network -input=none -output=filesystem - X-DocPath=kioslave/network/index.html Icon=network-workgroup diff --git a/kioslave/remote/remote.protocol b/kioslave/remote/remote.protocol index e3016aea..d773092e 100644 --- a/kioslave/remote/remote.protocol +++ b/kioslave/remote/remote.protocol @@ -1,8 +1,6 @@ [Protocol] exec=kio_remote protocol=remote -input=none -output=filesystem listing=true reading=true writing=false diff --git a/kioslave/sftp/sftp.protocol b/kioslave/sftp/sftp.protocol index d7843579..6bf0b728 100644 --- a/kioslave/sftp/sftp.protocol +++ b/kioslave/sftp/sftp.protocol @@ -1,8 +1,6 @@ [Protocol] exec=kio_sftp protocol=sftp -input=none -output=filesystem listing=true reading=true writing=true diff --git a/kioslave/thumbnail/thumbnail.protocol b/kioslave/thumbnail/thumbnail.protocol index 216f428a..530070b1 100644 --- a/kioslave/thumbnail/thumbnail.protocol +++ b/kioslave/thumbnail/thumbnail.protocol @@ -1,8 +1,6 @@ [Protocol] exec=kio_thumbnail protocol=thumbnail -input=stream -output=stream reading=true source=false X-DocPath=kioslave/thumbnail/index.html diff --git a/kioslave/trash/trash.protocol b/kioslave/trash/trash.protocol index 7b13b7de..06719192 100644 --- a/kioslave/trash/trash.protocol +++ b/kioslave/trash/trash.protocol @@ -1,8 +1,6 @@ [Protocol] exec=kio_trash protocol=trash -input=none -output=filesystem listing=true reading=true writing=true