From 2000e8acb0e5f851dfc4024b48c7f08610fc857e Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 9 Apr 2010 00:57:44 +0200
Subject: Re-enabling all KDE url magics

---
 src/application.cpp | 82 ++++++++++++++++++++++++++++-------------------------
 src/application.h   |  2 ++
 2 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/src/application.cpp b/src/application.cpp
index 3405a1b2..48264440 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -289,53 +289,23 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type)
     if (url.isEmpty())
         return;
 
-    // sanitization
-    KUrl loadingUrl( url.toEncoded() );
-
-    if ( !loadingUrl.isValid() )
+    if ( !url.isValid() )
     {
-        KMessageBox::error(0, i18n("Malformed URL:\n%1", loadingUrl.url(KUrl::RemoveTrailingSlash)));
+        KMessageBox::error(0, i18n("Malformed URL:\n%1", url.url(KUrl::RemoveTrailingSlash)));
         return;
     }
 
-    // first, create the webview(s) to not let hangs UI..
-    WebTab *tab = 0;
-    MainWindow *w = 0;
-    w = (type == Rekonq::NewWindow) 
-        ? newMainWindow()
-        : mainWindow();
-        
-    switch(type)
-    {
-    case Rekonq::SettingOpenTab:
-        tab = w->mainView()->newWebTab(!ReKonfig::openTabsBack(), ReKonfig::openTabsNearCurrent());
-        break;
-    case Rekonq::NewCurrentTab:
-        tab = w->mainView()->newWebTab(true);
-        break;
-    case Rekonq::NewBackTab:
-        tab = w->mainView()->newWebTab(false, ReKonfig::openTabsNearCurrent());
-        break;
-    case Rekonq::NewWindow:
-    case Rekonq::CurrentTab:
-        tab = w->mainView()->currentWebTab();
-        break;
-    };
-    
-    WebView *view = tab->view();
-    
-    if (view)
-    {
-        FilterUrlJob *job = new FilterUrlJob(view, loadingUrl.pathOrUrl(), this);
-        Weaver::instance()->enqueue(job);
-    }
+    prepareLoading(url.pathOrUrl(), type);
 }
 
 
 
 void Application::loadUrl(const QString& urlString,  const Rekonq::OpenType& type)
-{    
-    return loadUrl( QUrl::fromUserInput(urlString), type );
+{
+    if(urlString.isEmpty())
+        return;
+
+    prepareLoading(urlString, type);
 }
 
 
@@ -400,3 +370,39 @@ void Application::newWindow()
     loadUrl( KUrl("about:home"), Rekonq::NewWindow );
     mainWindow()->mainView()->urlBarWidget()->setFocus();
 }
+
+
+void Application::prepareLoading(const QString& urlString, const Rekonq::OpenType& type)
+{
+    // first, create the webview(s) to not let hangs UI..
+    WebTab *tab = 0;
+    MainWindow *w = 0;
+    w = (type == Rekonq::NewWindow) 
+        ? newMainWindow()
+        : mainWindow();
+        
+    switch(type)
+    {
+    case Rekonq::SettingOpenTab:
+        tab = w->mainView()->newWebTab(!ReKonfig::openTabsBack(), ReKonfig::openTabsNearCurrent());
+        break;
+    case Rekonq::NewCurrentTab:
+        tab = w->mainView()->newWebTab(true);
+        break;
+    case Rekonq::NewBackTab:
+        tab = w->mainView()->newWebTab(false, ReKonfig::openTabsNearCurrent());
+        break;
+    case Rekonq::NewWindow:
+    case Rekonq::CurrentTab:
+        tab = w->mainView()->currentWebTab();
+        break;
+    };
+    
+    WebView *view = tab->view();
+    
+    if (view)
+    {
+        FilterUrlJob *job = new FilterUrlJob(view, urlString, this);
+        Weaver::instance()->enqueue(job);
+    }
+}
diff --git a/src/application.h b/src/application.h
index 4340b004..760f7943 100644
--- a/src/application.h
+++ b/src/application.h
@@ -141,6 +141,8 @@ private slots:
     void loadResolvedUrl(ThreadWeaver::Job *);
     
 private:
+    void prepareLoading(const QString& urlString, const Rekonq::OpenType& type);
+    
     static QWeakPointer<HistoryManager> s_historyManager;
     static QWeakPointer<BookmarkProvider> s_bookmarkProvider;
     static QWeakPointer<SessionManager> s_sessionManager;
-- 
cgit v1.2.1