diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2009-10-11 09:54:39 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2009-10-11 09:54:39 +0200 |
commit | 04730b0ed35b415c8794076565525a8e142bc6d6 (patch) | |
tree | 7d5fb2c6bc551ca1c8f06d21e5be142e0c344ab0 /src/application.cpp | |
parent | Merge commit 'refs/merge-requests/1747' of git://gitorious.org/rekonq/mainlin... (diff) | |
parent | KIcon("go-home") for homepage (diff) | |
download | rekonq-04730b0ed35b415c8794076565525a8e142bc6d6.tar.xz |
Merge commit 'refs/merge-requests/1750' of git://gitorious.org/rekonq/mainline into SundayIll3
Diffstat (limited to 'src/application.cpp')
-rw-r--r-- | src/application.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/application.cpp b/src/application.cpp index fdd02bf5..f16b831d 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -243,9 +243,16 @@ SessionManager *Application::sessionManager() KIcon Application::icon(const KUrl &url) { + if(url.scheme() == "rekonq" || + (url.isEmpty() // Urlbar is empty for homepage, but we want an icon + && !Application::instance()->mainWindowList().isEmpty() // avoid infinite loop at startup + && Application::instance()->mainWindow()->currentTab()->url().scheme() == "rekonq") + ) + return KIcon("go-home"); + if(url.isEmpty()) return KIcon("text-html"); - + KIcon icon = KIcon(QWebSettings::iconForUrl(url)); if (icon.isNull()) { |