From 91c709932f8d49323f2834dcfb501fade27a8f6e Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 3 Aug 2012 01:26:03 +0200
Subject: Clean up url suggestions loading

---
 src/urlbar/urlbar.cpp | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'src/urlbar/urlbar.cpp')

diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index c77edeb5..a994ea95 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -47,7 +47,7 @@
 #include "favoritewidget.h"
 #include "rsswidget.h"
 
-#include "urlsuggester.h"
+#include "urlresolver.h"
 
 #include "webtab.h"
 #include "webpage.h"
@@ -202,16 +202,8 @@ void UrlBar::loadRequestedUrl(const KUrl& url, Rekonq::OpenType type)
 
 void UrlBar::loadDigitedUrl()
 {
-    UrlSuggester res(text());
-    UrlSuggestionList list = res.orderedSearchItems();
-    if (list.isEmpty())
-    {
-        loadRequestedUrl(KUrl(text()));
-    }
-    else
-    {
-        loadRequestedUrl(list.first().url);
-    }
+    KUrl u = UrlResolver::urlFromTextTyped(text());
+    loadRequestedUrl(u);
 }
 
 
@@ -651,6 +643,7 @@ void UrlBar::detectTypedString(const QString &typed)
 
 void UrlBar::suggest()
 {
+    kDebug() << "SUGGEST ABOUT DIGITED: " << text(); 
     if (!_box.isNull())
         _box.data()->suggestUrls(text());
 }
-- 
cgit v1.2.1