From 925725bfcf0f3ffba5107949bc8424e1fd6d1902 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 21 Dec 2010 21:59:23 +0100 Subject: Icon at the right of the urlbar that allows to add an opensearch engine introduce search icon description file downloaded after validation, not before icons updated when engine added add opensearch xml description files sync desktop file => fix add webshortcut use db_opensearch.json file to track opensearch engines create an opensearch description only when the engine support suggestions remove opensearch description when an engine is deleted in the webshortcut setting dialog popup: disable ok button when webshortcut is already used Lionel Chauvin is the man having done this big, big, big work!! I'm just merging ;) --- src/urlbar/urlresolver.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/urlbar/urlresolver.cpp') diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp index 57d6ca64..864eca04 100644 --- a/src/urlbar/urlresolver.cpp +++ b/src/urlbar/urlresolver.cpp @@ -412,16 +412,12 @@ void UrlResolver::suggestionsReceived(const QString &text, const ResponseList &s Q_FOREACH(const Response &i, suggestions) { - QString urlString = i.url; - if(urlString.isEmpty()) + QString url = i.url; + if (url.isEmpty()) { - QStringList list; - list << QL1S("kuriikwsfilter"); - urlString = KUriFilter::self()->filteredUri(i.title, list); + url = SearchEngine::buildQuery(searchEngine(), i.title); } - kDebug() << "RESPONSE URL: " << i.url; - - UrlSearchItem gItem(UrlSearchItem::Suggestion, urlString, i.title, i.description, i.image, i.image_width, i.image_height); + UrlSearchItem gItem(UrlSearchItem::Suggestion, url, i.title, i.description, i.image, i.image_width, i.image_height); sugList << gItem; } emit suggestionsReady(sugList, _typedString); -- cgit v1.2.1