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

List:       kde-commits
Subject:    branches/KDE/4.4/kdelibs/plasma
From:       Michael Pyne <mpyne () kde ! org>
Date:       2010-01-31 21:21:00
Message-ID: 1264972860.175464.24675.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1083222 by mpyne:

Fix a regression introduced in one of the 4.4 RCs in KDE 4.4, bug 224204 (http / ftp
URLs do not open web browser in KRunner). Pretty sure I'd tested it, but not thouroughly
enough it appears. I will forwardport shortly.

Patch reviewed by Marco Martin.

CCBUG:224204


 M  +6 -1      runnercontext.cpp  


--- branches/KDE/4.4/kdelibs/plasma/runnercontext.cpp #1083221:1083222
@@ -192,10 +192,15 @@
             } else {
                 KUrl url(term);
                 QString correctCasePath;
+                // check for a normal URL first
+                if (KProtocolInfo::protocolClass(url.protocol()) == ":internet" &&
+                    url.hasHost()) {
+                    type = RunnerContext::NetworkLocation;
                 // check if we have a local network location first, otherwise assume a path,
                 // but if a path doesn't have any slashes is a single word or
                 // sentence: it's too ambiguous to be sure we're in a filesystem context
-                if (KProtocolInfo::protocolClass(url.protocol()) == ":local" && !url.isLocalFile()) {
+                } else if (KProtocolInfo::protocolClass(url.protocol()) == ":local" &&
+                         !url.isLocalFile()) {
                     type = RunnerContext::NetworkLocation;
                 } else if ((path.indexOf('/') != -1 || path.indexOf('\\') != -1) &&
                            correctPathCase(path, correctCasePath)) {
[prev in list] [next in list] [prev in thread] [next in thread]