summaryrefslogtreecommitdiff
path: root/src/icons
diff options
context:
space:
mode:
authorLindsay Mathieson <lindsay.mathieson@gmail.com>2013-01-24 20:17:06 +1000
committerLindsay Mathieson <lindsay.mathieson@gmail.com>2013-01-24 20:17:06 +1000
commita068a29d7c33211a5d4e5ebc1a0227feba158b65 (patch)
treec25dd2e9da9d5242390d2bce41e6292ca3f2df78 /src/icons
parentAdded option for opening new tabs next to current (default to true). Otherwis... (diff)
parentImprove icon management code (diff)
downloadrekonq-a068a29d7c33211a5d4e5ebc1a0227feba158b65.tar.xz
Merge branch 'master' of git.kde.org:rekonq
Diffstat (limited to 'src/icons')
-rw-r--r--src/icons/iconmanager.cpp14
-rw-r--r--src/icons/iconmanager.h3
2 files changed, 1 insertions, 16 deletions
diff --git a/src/icons/iconmanager.cpp b/src/icons/iconmanager.cpp
index 49d637ad..e0408577 100644
--- a/src/icons/iconmanager.cpp
+++ b/src/icons/iconmanager.cpp
@@ -115,27 +115,15 @@ void IconManager::provideIcon(QWebFrame *mFrame, const KUrl &url, bool notify)
{
// provide icons just for http/https sites
if (!url.scheme().startsWith(QL1S("http")))
- {
- if (notify)
- emit iconChanged();
return;
- }
// do not load new icons in private browsing..
if (mFrame->page()->settings()->testAttribute(QWebSettings::PrivateBrowsingEnabled))
- {
- if (notify)
- emit iconChanged();
return;
- }
// check if icon exists
if (!favIconForUrl(url).isEmpty())
- {
- if (notify)
- emit iconChanged();
return;
- }
// the simplest way..
const QString rootUrlString = url.scheme() + QL1S("://") + url.host();
@@ -165,7 +153,7 @@ void IconManager::provideIcon(QWebFrame *mFrame, const KUrl &url, bool notify)
IconDownloader *id = new IconDownloader(faviconUrl, destUrl, this);
if (notify)
- connect(id, SIGNAL(iconReady()), this, SIGNAL(iconChanged()));
+ connect(id, SIGNAL(iconReady()), mFrame, SIGNAL(iconChanged()));
}
diff --git a/src/icons/iconmanager.h b/src/icons/iconmanager.h
index 02ae6763..9f39f965 100644
--- a/src/icons/iconmanager.h
+++ b/src/icons/iconmanager.h
@@ -64,9 +64,6 @@ public:
void saveDesktopIconForUrl(const KUrl &u);
-Q_SIGNALS:
- void iconChanged();
-
private:
IconManager(QObject *parent = 0);