From a67b0137ad0a8a4399de23238aa3cafdfdd3522f Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 2 Oct 2009 15:55:07 +0200
Subject: Simpler KIO management (no more metadata)

---
 src/webpage.cpp | 29 -----------------------------
 1 file changed, 29 deletions(-)

(limited to 'src/webpage.cpp')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 34a1e1b6..3f5e6244 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -80,8 +80,6 @@ WebPage::WebPage(QObject *parent)
 
     setNetworkAccessManager(Application::networkAccessManager());
     connect(networkAccessManager(), SIGNAL(finished(QNetworkReply*)), this, SLOT(manageNetworkErrors(QNetworkReply*)));
-
-    setSessionMetaData("ssl_activate_warnings", "TRUE");
     
     connect(this, SIGNAL(downloadRequested(const QNetworkRequest &)), this, SLOT(slotDownloadRequested(const QNetworkRequest &)));
     connect(this, SIGNAL(unsupportedContent(QNetworkReply *)), this, SLOT(slotHandleUnsupportedContent(QNetworkReply *)));
@@ -95,21 +93,6 @@ WebPage::~WebPage()
 
 bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type)
 {
-    // FIXME CHECK this 
-    if (frame)
-    {
-        // TODO: Check if we need to flag navigation from javascript as well.
-        // Currently QtWebKit provides no way to distinguish such requests and
-        // lumps them under QWebPage::NavigationTypeOther.
-        if (type == QWebPage::NavigationTypeLinkClicked)
-        {
-            QString scheme = request.url().scheme();
-            if (scheme == "https" || scheme == "webdavs")
-                setRequestMetaData("ssl_was_in_use", "TRUE");
-        }
-    }
-    setRequestMetaData("main_frame_request", (frame->parentFrame() ? "FALSE" : "TRUE"));
-
     if (m_keyboardModifiers & Qt::ControlModifier || m_pressedButtons == Qt::MidButton)
     {
         Application::instance()->loadUrl(request.url(), Rekonq::SettingOpenTab);
@@ -318,15 +301,3 @@ void WebPage::slotDownloadRequested(const QNetworkRequest &request)
     job->addMetaData("cache", "cache"); // Use entry from cache if available.
     job->uiDelegate()->setAutoErrorHandlingEnabled(true);
 }
-
-
-void WebPage::setSessionMetaData(const QString& key, const QString& value)
-{
-    qobject_cast<NetworkAccessManager*>(networkAccessManager())->sessionMetaData()[key] = value;
-}
-
-
-void WebPage::setRequestMetaData(const QString& key, const QString& value)
-{
-    qobject_cast<NetworkAccessManager*>(networkAccessManager())->requestMetaData()[key] = value;
-}
-- 
cgit v1.2.1