1 files changed, 10 insertions, 10 deletions

diff --git a/src/application.cpp b/src/application.cpp
index c072b9f7..35d52a23 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -220,7 +220,7 @@ KUrl Application::guessUrlFromString(const QString &string)
     }
     else    // Might be a shorturl - try to detect the schema.
     {
-        int dotIndex = urlStr.indexOf(QLatin1Char('.'));
+        int dotIndex = urlStr.indexOf(QLatin1Char(':'));
 
         if (dotIndex != -1)
         {
@@ -237,7 +237,7 @@ KUrl Application::guessUrlFromString(const QString &string)
     }
     
     // Fall back to QUrl's own tolerant parser.
-    KUrl url = KUrl(string);
+    KUrl url = KUrl(urlStr);
 
     return url;
 }
@@ -250,7 +250,7 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type)
 
     if ( !url.isValid() )
     {
-        KMessageBox::error(0, i18n("Malformed URL\n%1", url.url()));
+        KMessageBox::error(0, i18n("Malformed URL:\n%1", url.url()));
         return;
     }
     
@@ -289,7 +289,7 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type)
 
     if ( !KProtocolInfo::isKnownProtocol( loadingUrl ) )
     {
-        KMessageBox::error(0, i18n("Protocol not supported\n%1", url.protocol()));
+        KMessageBox::error(0, i18n("Protocol not supported:\n%1", url.protocol()));
         return;
     }
 
@@ -298,22 +298,22 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type)
     switch(type)
     {
     case Rekonq::SettingOpenTab:
-        webView = m_mainWindow->mainView()->newTab(!ReKonfig::openTabsBack());
+        webView = m_mainWindow->mainView()->newWebView(!ReKonfig::openTabsBack());
         if (!ReKonfig::openTabsBack())
         {
-            m_mainWindow->mainView()->currentUrlBar()->setUrl(loadingUrl.prettyUrl());
+            m_mainWindow->mainView()->urlBar()->setUrl(loadingUrl.prettyUrl());
         }
         break;
     case Rekonq::NewCurrentTab:
-        webView = m_mainWindow->mainView()->newTab(true);
-        m_mainWindow->mainView()->currentUrlBar()->setUrl(loadingUrl.prettyUrl());
+        webView = m_mainWindow->mainView()->newWebView(true);
+        m_mainWindow->mainView()->urlBar()->setUrl(loadingUrl.prettyUrl());
         break;
     case Rekonq::NewBackTab:
-        webView = m_mainWindow->mainView()->newTab(false);
+        webView = m_mainWindow->mainView()->newWebView(false);
         break;
     case Rekonq::CurrentTab:
         webView = m_mainWindow->mainView()->currentWebView();
-        m_mainWindow->mainView()->currentUrlBar()->setUrl(loadingUrl.prettyUrl());
+        m_mainWindow->mainView()->urlBar()->setUrl(loadingUrl.prettyUrl());
         break;
     };