Merge commit 'refs/merge-requests/1918' of git://gitorious.org/rekonq/mainline into Tue1918

2 files changed, 8 insertions, 7 deletions

diff --git a/src/application.cpp b/src/application.cpp
index 84aab713..634e068f 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -266,10 +266,7 @@ KIcon Application::icon(const KUrl &url)
 {
     if(!Application::instance()->mainWindowList().isEmpty()) // avoid infinite loop at startup
     {
-        // means it is the urlbar
-        if(url.isEmpty() && Application::instance()->mainWindow()->currentTab()->url().scheme() == "rekonq")
-            return KIcon("arrow-right");
-        
+
         if(url == KUrl("rekonq:closedTabs"))
             return KIcon("tab-close");
         if(url == KUrl("rekonq:history"))
diff --git a/src/urlbar.cpp b/src/urlbar.cpp
index 5850f4e4..b6340fe7 100644
--- a/src/urlbar.cpp
+++ b/src/urlbar.cpp
@@ -161,14 +161,18 @@ void UrlBar::slotUpdateUrl()
         kDebug() << "Don't change my typed url...";
         return;
     }
-    
+
+    KIcon icon;
+    if(m_currentUrl.isEmpty()) icon = KIcon("arrow-right");
+    else icon = Application::icon(m_currentUrl);
+
     if (count())
     {
-        changeUrl(0, Application::icon(m_currentUrl), m_currentUrl);
+        changeUrl(0, icon, m_currentUrl);
     }
     else
     {
-        insertUrl(0, Application::icon(m_currentUrl), m_currentUrl);
+        insertUrl(0, icon, m_currentUrl);
     }
 
     setCurrentIndex(0);