diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-04 02:51:41 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-04 02:51:41 +0000 |
| commit | 87c8ad5f0e992629d8abcf52d57410c85eb7fc88 (patch) | |
| tree | 8a55786b25bd152809ba2b4fbbc41579bfb15518 /net/proxy/proxy_config_service_linux.cc | |
| parent | b53945dbc78bef7f47c93928c6a2f23f0c6c0624 (diff) | |
| download | chromium_src-87c8ad5f0e992629d8abcf52d57410c85eb7fc88.zip chromium_src-87c8ad5f0e992629d8abcf52d57410c85eb7fc88.tar.gz chromium_src-87c8ad5f0e992629d8abcf52d57410c85eb7fc88.tar.bz2 | |
linux: obey proxy environment variables in preference to gconf
This fixes a tiny bug, where we were consulting gnome's settings
based on whether the DESKTOP_SESSION *wasn't* gnome.
TEST=Covered by new unit test.
Review URL: http://codereview.chromium.org/100318
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15184 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_config_service_linux.cc')
| -rw-r--r-- | net/proxy/proxy_config_service_linux.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index f864ed2..0d6f067 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -515,7 +515,7 @@ int ProxyConfigServiceLinux::GetProxyConfig(ProxyConfig* config) { bool ok = false; if (env_var_getter_->Getenv("GNOME_DESKTOP_SESSION_ID", &dummy) || (env_var_getter_->Getenv("DESKTOP_SESSION", &desktop_session) - && desktop_session.compare("gnome"))) { + && desktop_session.compare("gnome") == 0)) { // Get settings from gconf. // // I (sdoyon) would have liked to prioritize environment variables |