summaryrefslogtreecommitdiff
path: root/src/urlbar/urlresolver.h
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-11-07 16:35:41 +0100
committerAndrea Diamantini <adjam7@gmail.com>2010-11-07 16:35:41 +0100
commit65e287ee4a68dcd5019d3fad13b3ebfdd1ef23d4 (patch)
tree379a3c99565c72a9f7315f2aef093e6a8c3af87e /src/urlbar/urlresolver.h
parentcommit the changes by yurchor on the docbook (diff)
downloadrekonq-65e287ee4a68dcd5019d3fad13b3ebfdd1ef23d4.tar.xz
First bunch of fixes for the suggestions.
We are now respecting users setting on default engines (if someone chooses NONE default search engines, searches are NOT performed)
Diffstat (limited to 'src/urlbar/urlresolver.h')
-rw-r--r--src/urlbar/urlresolver.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h
index 3e8e4fce..e21e65e8 100644
--- a/src/urlbar/urlresolver.h
+++ b/src/urlbar/urlresolver.h
@@ -30,6 +30,8 @@
// Rekonq Includes
#include "rekonq_defines.h"
+
+// Locale Includes
#include "application.h"
#include "opensearchmanager.h"
@@ -87,7 +89,7 @@ public:
UrlSearchItem(const int &_type,
const QString &_url,
const QString &_title = QString(),
- const QString &_description = QString(),
+ const QString &_description = QString(),
const QString &_image = QString(),
const int &_image_width = 0,
const int &_image_height = 0
@@ -130,7 +132,8 @@ public:
static void setSearchEngine(KService::Ptr engine)
{
_searchEngine = engine;
- Application::opensearchManager()->setSearchProvider(engine->desktopEntryName());
+ if(engine)
+ Application::opensearchManager()->setSearchProvider(engine->desktopEntryName());
};
void computeSuggestions();