Merge branch 'master' of git://gitorious.org/rekonq/mainline into i18n

1 files changed, 12 insertions, 3 deletions

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 6bf172a6..b2bedffc 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -73,11 +73,19 @@
 WebPage::WebPage(QObject *parent)
         : KWebPage(parent, KWalletIntegration)
 {
-    // rekonq own classes integration
-    setNetworkAccessManager(new NetworkAccessManager(this));
+    setForwardUnsupportedContent(true);
+
+    // rekonq Network Manager
+    NetworkAccessManager *manager = new NetworkAccessManager(this);
+    
+    // disable QtWebKit cache to just use KIO one..
+    manager->setCache(0);
+    
+    setNetworkAccessManager(manager);
+    
+    // Web Plugin Factory
     setPluginFactory(new WebPluginFactory(this));
     
-    setForwardUnsupportedContent(true);
 
     connect(networkAccessManager(), SIGNAL(finished(QNetworkReply*)), this, SLOT(manageNetworkErrors(QNetworkReply*)));
     
@@ -91,6 +99,7 @@ WebPage::WebPage(QObject *parent)
 
 WebPage::~WebPage()
 {
+    disconnect();
 }