From 4f814dbe3850fa9b88817806668adf86122f0e3b Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 29 Jun 2010 10:55:51 +0200
Subject: Fix search engine toolbar icons
---
src/application.cpp | 1 +
src/urlbar/listitem.cpp | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/application.cpp b/src/application.cpp
index 4a9ba8c5..e58e8843 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -337,6 +337,7 @@ KIcon Application::icon(const KUrl &url)
KIcon icon = KIcon(QWebSettings::iconForUrl(url));
if (icon.isNull())
{
+ kDebug() << "null icon";
icon = KIcon("text-html");
}
return icon;
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index 037afb06..f10cefd7 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -345,7 +345,10 @@ EngineBar::EngineBar(KService::Ptr selectedEngine, QWidget *parent)
KAction *EngineBar::newEngineAction(KService::Ptr engine, KService::Ptr selectedEngine)
{
- QString url = engine->property("Query").toString();
+ QUrl u = engine->property("Query").toUrl();
+ KUrl url = KUrl( u.toString( QUrl::RemovePath | QUrl::RemoveQuery ) );
+
+ kDebug() << "Engine NAME: " << engine->name() << " URL: " << url;
KAction *a = new KAction(Application::icon(url), engine->name(), this);
a->setCheckable(true);
if (engine->desktopEntryName() == selectedEngine->desktopEntryName()) a->setChecked(true);
--
cgit v1.2.1