From 7a35bdc75a549a617bb3d8440a9a96f551bc26a2 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 29 Apr 2009 01:11:58 +0200
Subject: mainview loadurlinCurrentTab improvements

---
 src/application.cpp |  2 +-
 src/mainview.cpp    | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/application.cpp b/src/application.cpp
index 902c2946..16b24ba0 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -94,7 +94,7 @@ int Application::newInstance()
         {
             KUrl url = MainWindow::guessUrlFromString(args->arg(i));
             newWebView();
-            mainWindow()->loadUrl(url);
+            mainWindow()->mainView()->loadUrlInCurrentTab(url);
         }
         args->clear();
     }
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 7a7b36b3..ed09def9 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -623,9 +623,19 @@ void MainView::aboutToShowRecentTriggeredAction(QAction *action)
 void MainView::loadUrlInCurrentTab(const KUrl &url)
 {
     WebView *webView = currentWebView();
+
+    KUrl loadingUrl(url);
+
+    if (loadingUrl.isRelative())
+    {
+        QString fn = loadingUrl.url(KUrl::RemoveTrailingSlash);
+        loadingUrl.setUrl("//" + fn);
+        loadingUrl.setScheme("http");
+    }
+
     if (webView)
     {
-        webView->loadUrl(url);
+        webView->load(loadingUrl);
         webView->setFocus();
     }
 }
-- 
cgit v1.2.1