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

svn path=/branches/KDE/4.4/kdelibs/; revision=1083222
This commit is contained in:
Michael Pyne 2010-01-31 21:20:59 +00:00
parent 55853f7cb3
commit b0737279cd

View File

@ -192,10 +192,15 @@ class RunnerContextPrivate : public QSharedData
} 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)) {