From cc6fa971a01ebd2f16db11bea99d2e8d008682fc Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 22 Nov 2013 18:07:45 +0100
Subject: improvements on urlbar STEP 2: - work & fix  on search engine
 favicons - simplify code (and remove dead one) - API clean up - delete ASAP
 list items and suggestions - let the URL in the suggestions be an hard grey

---
 src/icons/iconmanager.cpp | 11 ++++-------
 src/icons/iconmanager.h   |  3 +--
 src/icons/webicon.cpp     |  6 ------
 3 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'src/icons')

diff --git a/src/icons/iconmanager.cpp b/src/icons/iconmanager.cpp
index cc09e252..7bc47eec 100644
--- a/src/icons/iconmanager.cpp
+++ b/src/icons/iconmanager.cpp
@@ -207,18 +207,15 @@ QString IconManager::iconPathForUrl(const KUrl &url)
 }
 
 
-void IconManager::provideEngineFavicon(const KUrl &url)
-{
-    // will autodelete itself when done
-    new WebIcon(url);
-}
-
-
 KIcon IconManager::engineFavicon(const KUrl &url)
 {
     if (QFile::exists(_faviconsDir + url.host() + QL1S(".png")))
         return KIcon(QIcon(_faviconsDir + url.host() + QL1S(".png")));
 
+    // if engine favicon is NOT found, download it
+    // will autodelete itself when done
+    new WebIcon(url);
+
     kDebug() << "NO ENGINE FAVICON";
     return KIcon("text-html");
 }
diff --git a/src/icons/iconmanager.h b/src/icons/iconmanager.h
index a120be16..659eff88 100644
--- a/src/icons/iconmanager.h
+++ b/src/icons/iconmanager.h
@@ -60,8 +60,7 @@ public:
 
     void saveDesktopIconForUrl(const KUrl &u);
 
-    // Engine ToolBar needed methods
-    void provideEngineFavicon(const KUrl &);
+    // Engine ToolBar needed method
     KIcon engineFavicon(const KUrl &);
     
 private:
diff --git a/src/icons/webicon.cpp b/src/icons/webicon.cpp
index 7230b3a6..77973782 100644
--- a/src/icons/webicon.cpp
+++ b/src/icons/webicon.cpp
@@ -76,12 +76,6 @@ void WebIcon::saveIcon(bool b)
     QString faviconsDir = KStandardDirs::locateLocal("cache" , "favicons/" , true);
     QString faviconPath = faviconsDir + m_url.host();
 
-    if ( QFile::exists(faviconPath + QL1S(".png")) )
-    {
-        this->deleteLater();
-        return;
-    }
-    
     // dest url
     KUrl destUrl(faviconPath);
     kDebug() << "DEST URL: " << destUrl;
-- 
cgit v1.2.1