summaryrefslogtreecommitdiff
path: root/src/icons
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2013-11-22 18:07:45 +0100
committerAndrea Diamantini <adjam7@gmail.com>2013-11-22 18:07:45 +0100
commitcc6fa971a01ebd2f16db11bea99d2e8d008682fc (patch)
tree768acaa5ed864eebbd27782dfac592233e27a547 /src/icons
parentDo NOT download everytime engines favicons if present (diff)
downloadrekonq-cc6fa971a01ebd2f16db11bea99d2e8d008682fc.tar.xz
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
Diffstat (limited to 'src/icons')
-rw-r--r--src/icons/iconmanager.cpp11
-rw-r--r--src/icons/iconmanager.h3
-rw-r--r--src/icons/webicon.cpp6
3 files changed, 5 insertions, 15 deletions
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;