summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2022-05-31 08:56:09 +0200
committerSlávek Banko <slavek.banko@axis.cz>2022-05-31 16:26:11 +0200
commita760303dd89199beb31f1df9a8f99c4eb989957b (patch)
treee49272c3424f64580bf91acb055ee98dd857b936
parente16086bb8a7ac0c5b50b0cb5441bda2aa5a211a6 (diff)
downloadtdelibs-v3.5.13-sru.tar.gz
tdelibs-v3.5.13-sru.zip
Fix the last wrong condition from commit 99739b61143c05f7fb1157dc145e19e9c090de6e.v3.5.13-sru
Revert the wrong fix from commit 3d3e77773df70317267c2d471c37e9374256590d. If desktop file does not include X-TDE-Protocols property, use X-KDE-Protocols property to limit the use of TDEIO protocols for non-TDE programs. This resolves issue TDE/tdebase#224. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit eaa7f3e3d4eac4876803d20bdda9ee0d701d5f5b)
-rw-r--r--kio/kio/krun.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp
index 298cc93e..f49cc441 100644
--- a/kio/kio/krun.cpp
+++ b/kio/kio/krun.cpp
@@ -699,8 +699,12 @@ static pid_t runTempService( const KService& _service, const KURL::List& _urls,
static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service )
{
// Check which protocols the application supports.
- // This can be a list of actual protocol names, or just KIO for KDE apps.
+ // This can be a list of actual protocol names, or just TDEIO for TDE apps, or KIO for KDE apps.
TQStringList supportedProtocols = _service.property("X-KDE-Protocols").toStringList();
+ if (supportedProtocols.isEmpty())
+ {
+ supportedProtocols = _service.property("X-TDE-Protocols").toStringList();
+ }
KRunMX1 mx1( _service );
TQString exec = _service.exec();
if ( mx1.expandMacrosShellQuote( exec ) && !mx1.hasUrls ) {
@@ -708,9 +712,9 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service
} else {
if ( supportedProtocols.isEmpty() )
{
- // compat mode: assume KIO if not set and it's a KDE app
+ // compat mode: assume KIO if not set and it's a TDE or KDE app
TQStringList categories = _service.property("Categories").toStringList();
- if (( categories.find("TDE") != categories.end() ) && ( categories.find("KDE") != categories.end() ))
+ if ((categories.find("TDE") != categories.end()) || (categories.find("KDE") != categories.end()))
supportedProtocols.append( "KIO" );
else { // if no KDE app, be a bit over-generic
supportedProtocols.append( "http");
@@ -721,13 +725,13 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service
kdDebug(7010) << "supportedProtocols:" << supportedProtocols << endl;
KURL::List urls( _urls );
- if ( supportedProtocols.find( "KIO" ) == supportedProtocols.end() ) {
+ if ((supportedProtocols.find("KIO") == supportedProtocols.end()) &&
+ (supportedProtocols.find("TDEIO") == supportedProtocols.end())) {
for( KURL::List::Iterator it = urls.begin(); it != urls.end(); ++it ) {
const KURL url = *it;
bool supported = url.isLocalFile() || supportedProtocols.find( url.protocol().lower() ) != supportedProtocols.end();
kdDebug(7010) << "Looking at url=" << url << " supported=" << supported << endl;
- if ( !supported && KProtocolInfo::protocolClass(url.protocol()) == ":local" &&
- !url.url().startsWith("media:/") && !url.url().startsWith("system:/media"))
+ if ((!supported) && (KProtocolInfo::protocolClass(url.protocol()) == ":local"))
{
// Maybe we can resolve to a local URL?
KURL localURL = KIO::NetAccess::mostLocalURL( url, 0 );