From 9383d2e46171ac4cb81ecda139fa0571efaededf Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 14 Aug 2012 01:05:54 +0200
Subject: Get sure web shortcuts are considered first url detection

BUG: 304994
---
 src/urlbar/urlresolver.cpp | 5 ++++-
 src/urlbar/urlresolver.h   | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index 43670a14..c6d0f7a4 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -63,6 +63,7 @@ UrlResolver::UrlResolver(const QString &typedUrl)
     : QObject()
     , _typedString(typedUrl.trimmed())
     , _typedQuery()
+    , _isKDEUrl(false)
 {
     if (!_searchEngine)
         setSearchEngine(SearchEngine::defaultEngine());
@@ -175,7 +176,8 @@ UrlSearchList UrlResolver::orderLists()
     // Browse & Search results
     UrlSearchList browseSearch;
     QString lowerTypedString = _typedString.toLower();
-    if (_browseRegexp.indexIn(lowerTypedString) != -1)
+    if (!_isKDEUrl
+            && (_browseRegexp.indexIn(lowerTypedString) != -1))
     {
         webSearchFirst = true;
         browseSearch << _webSearches;
@@ -291,6 +293,7 @@ void UrlResolver::computeWebSearches()
     {
         query = query.remove(0, _typedString.indexOf(SearchEngine::delimiter()) + 1);
         setSearchEngine(engine);
+        _isKDEUrl = true;
     }
 
     if (_searchEngine)
diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h
index 97a5e9a4..d799231f 100644
--- a/src/urlbar/urlresolver.h
+++ b/src/urlbar/urlresolver.h
@@ -170,6 +170,8 @@ private:
     static QRegExp _searchEnginesRegexp;
 
     static KService::Ptr _searchEngine;
+
+    bool _isKDEUrl;
 };
 
 // ------------------------------------------------------------------------------
-- 
cgit v1.2.1