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

List:       kde-commits
Subject:    branches/KDE/4.5/kdelibs/kio/kio
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2010-09-07 20:07:19
Message-ID: 20100907200719.75654AC769 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1172681 by lunakl:

Backport r1172680:
Use kioexec also for the case of opening a remote URL with an app
that claims remote url support but doesn't support the particular
protocol (e.g. OOo and smb:).
http://svn.reviewboard.kde.org/r/5280/



 M  +52 -24    krun.cpp  


--- branches/KDE/4.5/kdelibs/kio/kio/krun.cpp #1172680:1172681
@@ -356,6 +356,40 @@
     return 2;
 }
 
+static QStringList supportedProtocols(const KService& _service)
+{
+    // Check which protocols the application supports.
+    // This can be a list of actual protocol names, or just KIO for KDE apps.
+    QStringList supportedProtocols = \
_service.property("X-KDE-Protocols").toStringList(); +    KRunMX1 mx1(_service);
+    QString exec = _service.exec();
+    if (mx1.expandMacrosShellQuote(exec) && !mx1.hasUrls) {
+        Q_ASSERT(supportedProtocols.isEmpty());   // huh? If you support protocols \
you need %u or %U... +    }
+    else {
+        if (supportedProtocols.isEmpty()) {
+            // compat mode: assume KIO if not set and it's a KDE app
+            const QStringList categories = \
_service.property("Categories").toStringList(); +            if \
(categories.contains("KDE")) { +                supportedProtocols.append("KIO");
+            }
+            else { // if no KDE app, be a bit over-generic
+                supportedProtocols.append("http");
+                supportedProtocols.append("ftp");
+            }
+        }
+    }
+    kDebug(7010) << "supportedProtocols:" << supportedProtocols;
+    return supportedProtocols;
+}
+
+static bool isProtocolInSupportedList(const KUrl& url, const QStringList& \
supportedProtocols) +{
+    if (supportedProtocols.contains("KIO"))
+        return true;
+    return url.isLocalFile() || \
supportedProtocols.contains(url.protocol().toLower()); +}
+
 QStringList KRun::processDesktopExec(const KService &_service, const KUrl::List& \
_urls, bool tempFiles, const QString& suggestedFileName)  {
     QString exec = _service.exec();
@@ -392,9 +426,24 @@
     }
 
     // Check if we need kioexec
+    bool useKioexec = false;
     if (!mx1.hasUrls) {
         for (KUrl::List::ConstIterator it = _urls.begin(); it != _urls.end(); ++it)
             if (!(*it).isLocalFile() && !KProtocolInfo::isHelperProtocol(*it)) {
+                useKioexec = true;
+                kDebug(7010) << "non-local files, application does not support urls, \
using kioexec"; +                break;
+            }
+    } else { // app claims to support %u/%U, check which protocols
+        QStringList appSupportedProtocols = supportedProtocols(_service);
+        for (KUrl::List::ConstIterator it = _urls.begin(); it != _urls.end(); ++it)
+            if( !isProtocolInSupportedList(*it, appSupportedProtocols)) {
+                useKioexec = true;
+                kDebug(7010) << "application does not support url, using kioexec:" \
<< *it; +                break;
+            }
+    }
+    if (useKioexec) {
                 // We need to run the app through kioexec
                 const QString kioexec = KStandardDirs::findExe("kioexec");
                 Q_ASSERT(!kioexec.isEmpty());
@@ -410,7 +459,6 @@
                 result += _urls.toStringList();
                 return result;
             }
-    }
 
     if (appHasTempFileOption) {
         exec += " --tempfile";
@@ -678,32 +726,12 @@
 {
     // Check which protocols the application supports.
     // This can be a list of actual protocol names, or just KIO for KDE apps.
-    QStringList supportedProtocols = \
                _service.property("X-KDE-Protocols").toStringList();
-    KRunMX1 mx1(_service);
-    QString exec = _service.exec();
-    if (mx1.expandMacrosShellQuote(exec) && !mx1.hasUrls) {
-        Q_ASSERT(supportedProtocols.isEmpty());   // huh? If you support protocols \
                you need %u or %U...
-    }
-    else {
-        if (supportedProtocols.isEmpty()) {
-            // compat mode: assume KIO if not set and it's a KDE app
-            const QStringList categories = \
                _service.property("Categories").toStringList();
-            if (categories.contains("KDE")) {
-                supportedProtocols.append("KIO");
-            }
-            else { // if no KDE app, be a bit over-generic
-                supportedProtocols.append("http");
-                supportedProtocols.append("ftp");
-            }
-        }
-    }
-    kDebug(7010) << "supportedProtocols:" << supportedProtocols;
-
+    QStringList appSupportedProtocols = supportedProtocols(_service);
     KUrl::List urls(_urls);
-    if (!supportedProtocols.contains("KIO")) {
+    if (!appSupportedProtocols.contains("KIO")) {
         for (KUrl::List::Iterator it = urls.begin(); it != urls.end(); ++it) {
             const KUrl url = *it;
-            bool supported = url.isLocalFile() || \
supportedProtocols.contains(url.protocol().toLower()); +            bool supported = \
                isProtocolInSupportedList(url, appSupportedProtocols);
             kDebug(7010) << "Looking at url=" << url << " supported=" << supported;
             if (!supported && KProtocolInfo::protocolClass(url.protocol()) == \
":local") {  // Maybe we can resolve to a local URL?


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