summaryrefslogtreecommitdiff
path: root/src/iconmanager.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-10-28 22:19:24 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-10-28 22:19:24 +0200
commitcf7662212b6915dc0ea0992e0f9eb6509481b767 (patch)
treef39c1c51245794be5ca6c22de44e8287e5eabcc4 /src/iconmanager.cpp
parentMerge branch 'AboutPagesIcon' into NEWMASTER (diff)
parentThis commit implements the new private browsign mode for rekonq: (diff)
downloadrekonq-cf7662212b6915dc0ea0992e0f9eb6509481b767.tar.xz
Merge branch 'NewPrivateBrowsing' into NEWMASTER
Diffstat (limited to 'src/iconmanager.cpp')
-rw-r--r--src/iconmanager.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp
index 5086c59d..f5b60ea6 100644
--- a/src/iconmanager.cpp
+++ b/src/iconmanager.cpp
@@ -65,10 +65,6 @@ KIcon IconManager::iconForUrl(const KUrl &url)
// first things first.. avoid infinite loop at startup
if (url.isEmpty() || Application::instance()->mainWindowList().isEmpty())
return KIcon("text-html");
-
- // no icons in private browsing..
- if(QWebSettings::globalSettings()->testAttribute(QWebSettings::PrivateBrowsingEnabled))
- return KIcon("view-media-artist");
QByteArray encodedUrl = url.toEncoded();
// rekonq icons..
@@ -114,7 +110,7 @@ void IconManager::provideIcon(QWebPage *page, const KUrl &url, bool notify)
return;
}
- // no icons in private browsing..
+ // do not load new icons in private browsing..
if(QWebSettings::globalSettings()->testAttribute(QWebSettings::PrivateBrowsingEnabled))
{
kDebug() << "Private browsing, private icon...";