From 4fb210b9e225fffafdaac26e0acb3c0b71087137 Mon Sep 17 00:00:00 2001
From: Jukka Rissanen <jukka.rissanen@nokia.com>
Date: Thu, 25 Nov 2010 12:33:14 +0200
Subject: Fix proxy reading from gconf so that it is only done once / session.

Fixes: NB#194509 - Network access from a Qt app makes dbus daemon
       consume tons of cpu

Task-number: QT-4220
---
 src/plugins/bearer/icd/proxyconf.cpp | 18 ++++++++++++++----
 src/plugins/bearer/icd/proxyconf.h   |  1 +
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/plugins/bearer/icd/proxyconf.cpp b/src/plugins/bearer/icd/proxyconf.cpp
index e5c8f4e..37501fb 100644
--- a/src/plugins/bearer/icd/proxyconf.cpp
+++ b/src/plugins/bearer/icd/proxyconf.cpp
@@ -142,16 +142,23 @@ QHash<QString,QVariant> GConfItemFast::getEntries() const
 
 
 
-class NetworkProxyFactory : QNetworkProxyFactory {
+class NetworkProxyFactory : QNetworkProxyFactory
+{
+    ProxyConf proxy_conf;
+    bool proxy_data_read;
+
 public:
-    NetworkProxyFactory() { }
+    NetworkProxyFactory() : proxy_data_read(false) {  }
     QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query = QNetworkProxyQuery());
 };
 
 
 QList<QNetworkProxy> NetworkProxyFactory::queryProxy(const QNetworkProxyQuery &query)
 {
-    ProxyConf proxy_conf;
+    if (proxy_data_read == false) {
+        proxy_data_read = true;
+        proxy_conf.readProxyData();
+    }
 
     QList<QNetworkProxy> result = proxy_conf.flush(query);
     if (result.isEmpty())
@@ -377,10 +384,13 @@ ProxyConf::~ProxyConf()
     delete d_ptr;
 }
 
+void ProxyConf::readProxyData()
+{
+    d_ptr->readProxyData();
+}
 
 QList<QNetworkProxy> ProxyConf::flush(const QNetworkProxyQuery &query)
 {
-    d_ptr->readProxyData();
     return d_ptr->flush(query);
 }
 
diff --git a/src/plugins/bearer/icd/proxyconf.h b/src/plugins/bearer/icd/proxyconf.h
index 884cc5c..eedbbf2 100644
--- a/src/plugins/bearer/icd/proxyconf.h
+++ b/src/plugins/bearer/icd/proxyconf.h
@@ -58,6 +58,7 @@ public:
     virtual ~ProxyConf();
 
     QList<QNetworkProxy> flush(const QNetworkProxyQuery &query = QNetworkProxyQuery());  // read the proxies from db
+    void readProxyData();
 
     /* Note that for each update() call there should be corresponding
      * clear() call because the ProxyConf class implements a reference
-- 
cgit v0.12