diff options
| author | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-12 00:26:24 +0000 |
|---|---|---|
| committer | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-12 00:26:24 +0000 |
| commit | 2e8cfe2f5ac7075bc8ec76dbbcad60a1183c71cb (patch) | |
| tree | 00b5cbfe598e9ac1e5bf45a865f0d7a8a7089510 /net/proxy/proxy_config_service_linux.cc | |
| parent | 3e6a21188cfa5c3910487cb040571bc0c560b801 (diff) | |
| download | chromium_src-2e8cfe2f5ac7075bc8ec76dbbcad60a1183c71cb.zip chromium_src-2e8cfe2f5ac7075bc8ec76dbbcad60a1183c71cb.tar.gz chromium_src-2e8cfe2f5ac7075bc8ec76dbbcad60a1183c71cb.tar.bz2 | |
Use KDEHOME variable instead of KDE_HOME for locating KDE directory
KDE uses the former, not the latter.
R=mdm,wtc
BUG=none
TEST=unit tests updated, change KDE proxy settings with custom KDEHOME and verify Chrome picks it up
Review URL: http://codereview.chromium.org/2779015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49620 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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index 6444f0b..bf25ebb 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -417,11 +417,11 @@ class GConfSettingGetterImplKDE env_var_getter_(env_var_getter), file_loop_(NULL) { // Derive the location of the kde config dir from the environment. std::string home; - if (env_var_getter->GetEnv("KDE_HOME", &home) && !home.empty()) { - // $KDE_HOME is set. Use it unconditionally. + if (env_var_getter->GetEnv("KDEHOME", &home) && !home.empty()) { + // $KDEHOME is set. Use it unconditionally. kde_config_dir_ = KDEHomeToConfigPath(FilePath(home)); } else { - // $KDE_HOME is unset. Try to figure out what to use. This seems to be + // $KDEHOME is unset. Try to figure out what to use. This seems to be // the common case on most distributions. if (!env_var_getter->GetEnv("HOME", &home)) // User has no $HOME? Give up. Later we'll report the failure. |