summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-06-08 23:28:13 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-06-08 23:28:13 +0200
commit773e9eb35f8653925ed76a1cdd26708f85302c58 (patch)
tree56070f401a2ea8b4463d1f32394b36cf78d5baf8
parentLink webshortcuts default engine into urlbar default engine - without (diff)
parentmore contraints for privileged item selection (diff)
downloadrekonq-773e9eb35f8653925ed76a1cdd26708f85302c58.tar.xz
Merge commit 'refs/merge-requests/135' of git://gitorious.org/rekonq/mainline into privitem
-rw-r--r--src/urlbar/urlresolver.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index e4e2cd78..1f4f9f9c 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -316,18 +316,16 @@ UrlSearchList UrlResolver::bookmarksResolution()
UrlSearchItem UrlResolver::privilegedItem(UrlSearchList* list)
{
UrlSearchItem item;
- QString dot;
- if(!_typedString.endsWith(QL1C('.')))
- {
- dot = QString(QL1C('.'));
- }
+ QString dot = QString(QL1C('.'));
+ QString test1 = QString(QL1C('/')) + _typedString + dot;
+ QString test2 = dot + _typedString + dot;
for(int i = 0; i<list->count(); i++)
{
item = list->at(i);
//kDebug() << item.url.host();
//TODO: move this to AwesomeUrlCompletion::substringCompletion and add a priviledged flag to UrlSearchItem
- if (item.url.contains(_typedString + dot))
+ if (item.url.contains(test1) || item.url.contains(test2))
{
list->removeAt(i);
return item;