Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

Merge pull request #1834 from kkofler/no-proxy-default

Browse Source 
Default to NoProxy rather than HttpProxy
This commit is contained in:
David Rosca 2016-01-14 09:39:05 +01:00
commit be1bacd27b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/network/networkproxyfactory.cpp
View File

@ -62,7 +62,7 @@ bool WildcardMatcher::match(const QString &str) const
NetworkProxyFactory::NetworkProxyFactory()
: QNetworkProxyFactory()
, m_proxyPreference(SystemProxy)
, m_proxyType(QNetworkProxy::HttpProxy)
, m_proxyType(QNetworkProxy::NoProxy)
, m_port(0)
, m_httpsPort(0)
, m_useDifferentProxyForHttps(false)
@ -74,7 +74,7 @@ void NetworkProxyFactory::loadSettings()
Settings settings;
settings.beginGroup("Web-Proxy");
m_proxyPreference = ProxyPreference(settings.value("UseProxy", SystemProxy).toInt());
m_proxyType = QNetworkProxy::ProxyType(settings.value("ProxyType", QNetworkProxy::HttpProxy).toInt());
m_proxyType = QNetworkProxy::ProxyType(settings.value("ProxyType", QNetworkProxy::NoProxy).toInt());
m_useDifferentProxyForHttps = settings.value("UseDifferentProxyForHttps", false).toBool();
m_hostName = settings.value("HostName", QString()).toString();

2
src/lib/preferences/preferences.cpp
View File

@ -420,7 +420,7 @@ Preferences::Preferences(BrowserWindow* window)
// Proxy Configuration
settings.beginGroup("Web-Proxy");
QNetworkProxy::ProxyType proxyType = QNetworkProxy::ProxyType(settings.value("ProxyType", QNetworkProxy::HttpProxy).toInt());
QNetworkProxy::ProxyType proxyType = QNetworkProxy::ProxyType(settings.value("ProxyType", QNetworkProxy::NoProxy).toInt());
ui->systemProxy->setChecked(proxyType == QNetworkProxy::NoProxy);
ui->manualProxy->setChecked(proxyType != QNetworkProxy::NoProxy);

2
src/plugins/StatusBarIcons/sbi_networkproxy.cpp
View File

@ -89,7 +89,7 @@ void SBI_NetworkProxy::loadFromSettings(const QSettings &settings)
m_username = settings.value("Username", QString()).toString();
m_password = settings.value("Password", QString()).toString();
m_type = QNetworkProxy::ProxyType(settings.value("ProxyType", QNetworkProxy::HttpProxy).toInt());
m_type = QNetworkProxy::ProxyType(settings.value("ProxyType", QNetworkProxy::NoProxy).toInt());
}
void SBI_NetworkProxy::saveToSettings(QSettings &settings) const