wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 824341 - Change GetProxyFromGConf() and GetProxyFromGSettings() so they only will return NS_OK when a proxy is set. r=karlt

Browse Source
This commit is contained in:
David Geistert 2013-03-07 21:14:36 +01:00
parent 9a775facd5
commit f586f3b5f0
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
View File

@ -56,13 +56,15 @@ nsresult
nsUnixSystemProxySettings::Init()
{
mSchemeProxySettings.Init(5);
mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
if (mGSettings) {
mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"),
getter_AddRefs(mProxySettings));
}
if (!mProxySettings) {
mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
}
return NS_OK;
}
@ -382,9 +384,9 @@ nsUnixSystemProxySettings::GetProxyFromGConf(const nsACString& aScheme,
{
bool masterProxySwitch = false;
mGConf->GetBool(NS_LITERAL_CSTRING("/system/http_proxy/use_http_proxy"), &masterProxySwitch);
// if no proxy is set in GConf return NS_ERROR_FAILURE
if (!(IsProxyMode("manual") || masterProxySwitch)) {
aResult.AppendLiteral("DIRECT");
return NS_OK;
return NS_ERROR_FAILURE;
}
nsCOMPtr<nsIArray> ignoreList;
@ -427,10 +429,7 @@ nsUnixSystemProxySettings::GetProxyFromGConf(const nsACString& aScheme,
rv = NS_ERROR_FAILURE;
}
if (NS_FAILED(rv)) {
aResult.AppendLiteral("DIRECT");
}
return NS_OK;
return rv;
}
nsresult
@ -443,9 +442,9 @@ nsUnixSystemProxySettings::GetProxyFromGSettings(const nsACString& aScheme,
nsresult rv = mProxySettings->GetString(NS_LITERAL_CSTRING("mode"), proxyMode);
NS_ENSURE_SUCCESS(rv, rv);
// return NS_ERROR_FAILURE when no proxy is set
if (!proxyMode.Equals("manual")) {
aResult.AppendLiteral("DIRECT");
return NS_OK;
return NS_ERROR_FAILURE;
}
nsCOMPtr<nsIArray> ignoreList;