summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-10-11 09:54:39 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-10-11 09:54:39 +0200
commit04730b0ed35b415c8794076565525a8e142bc6d6 (patch)
tree7d5fb2c6bc551ca1c8f06d21e5be142e0c344ab0
parentMerge commit 'refs/merge-requests/1747' of git://gitorious.org/rekonq/mainlin... (diff)
parentKIcon("go-home") for homepage (diff)
downloadrekonq-04730b0ed35b415c8794076565525a8e142bc6d6.tar.xz
Merge commit 'refs/merge-requests/1750' of git://gitorious.org/rekonq/mainline into SundayIll3
-rw-r--r--src/application.cpp9
-rw-r--r--src/urlbar.cpp6
2 files changed, 12 insertions, 3 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())
{
diff --git a/src/urlbar.cpp b/src/urlbar.cpp
index 5776961b..5ad8314e 100644
--- a/src/urlbar.cpp
+++ b/src/urlbar.cpp
@@ -135,10 +135,12 @@ void UrlBar::setUrl(const QUrl& url)
{
if(url.scheme() == "rekonq")
{
+ m_currentUrl = "";
setFocus();
- return;
}
- m_currentUrl = url;
+ else
+ m_currentUrl = url;
+
slotUpdateUrl();
}