5 files changed, 10 insertions, 5 deletions
diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop
index e71a25e7..692c1ef0 100644
--- a/src/data/rekonq.desktop
+++ b/src/data/rekonq.desktop
@@ -52,7 +52,6 @@ GenericName[es]=Navegador web
 GenericName[et]=Veebilehitseja
 GenericName[fa]=مرورگر وب
 GenericName[fi]=WWW-selain
-GenericName[fr]=Navigateur web
 GenericName[ga]=Brabhsálaí Gréasáin
 GenericName[hu]=Webböngésző
 GenericName[it]=Browser Web
diff --git a/src/mainview.cpp b/src/mainview.cpp
index c7d66fa1..fb5e3a97 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -349,6 +349,8 @@ void MainView::newTab()
 {
     WebView *w = newWebTab()->view();
 
+    currentUrlBar()->setFocus();
+
     switch (ReKonfig::newTabsBehaviour())
     {
     case 0: // new tab page
@@ -363,7 +365,6 @@ void MainView::newTab()
     default:
         break;
     }
-    currentUrlBar()->setFocus();
 }
 
 
@@ -530,6 +531,11 @@ void MainView::webViewLoadStarted()
 
     emit browserTabLoading(true);
     emit showStatusBarMessage(i18n("Loading..."), Rekonq::Info);
+    
+    if (view == currentWebTab()->view() && view->url().scheme() != QL1S("about"))
+    {
+        view->setFocus();
+    }
 }
 
 
diff --git a/src/opensearch/opensearchmanager.cpp b/src/opensearch/opensearchmanager.cpp
index 2b5d24ae..591a4acb 100644
--- a/src/opensearch/opensearchmanager.cpp
+++ b/src/opensearch/opensearchmanager.cpp
@@ -65,7 +65,7 @@ OpenSearchManager::OpenSearchManager(QObject *parent)
 
 OpenSearchManager::~OpenSearchManager()
 {
-    qDeleteAll(m_engineCache.values());
+    qDeleteAll(m_engineCache);
     m_engineCache.clear();
     m_engines.clear();
 }
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index c6f4210e..17a4585d 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -475,7 +475,7 @@ EngineBar::EngineBar(KService::Ptr selectedEngine, QWidget *parent)
     if (SearchEngine::defaultEngine().isNull())
         return;
     m_engineGroup->addAction(newEngineAction(SearchEngine::defaultEngine(), selectedEngine));
-    foreach(KService::Ptr engine, SearchEngine::favorites())
+    foreach(const KService::Ptr &engine, SearchEngine::favorites())
     {
         if (engine->desktopEntryName() != SearchEngine::defaultEngine()->desktopEntryName())
         {
diff --git a/src/webview.cpp b/src/webview.cpp
index 7c02ee06..ca7f1b70 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -226,7 +226,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
     {
         KActionMenu *searchMenu = new KActionMenu(KIcon("edit-find"), i18n("Search with"), this);
 
-        foreach(KService::Ptr engine, SearchEngine::favorites())
+        foreach(const KService::Ptr &engine, SearchEngine::favorites())
         {
             a = new KAction(engine->name(), this);
             a->setIcon(rApp->iconManager()->iconForUrl(SearchEngine::buildQuery(engine, "")));