From d1f9d471997d01d1266c43bcb6c6457c4396177d Mon Sep 17 00:00:00 2001 From: "mdm@chromium.org" Date: Thu, 13 Aug 2009 19:59:30 +0000 Subject: Correctly update gconf proxy settings on Linux. BUG=19229 TEST=set gnome proxy settings, start chromium, change proxy settings, change proxy settings *back*, see that they correctly update in chromium Review URL: http://codereview.chromium.org/164497 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23346 0039d316-1c4b-4281-b951-d872f2087c98 --- net/proxy/proxy_config_service_linux.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index 3c74c4d..855c6a4 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -512,7 +512,7 @@ void ProxyConfigServiceLinux::Delegate::SetupAndFetchInitialConfig( glib_default_loop_ = glib_default_loop; io_loop_ = io_loop; - // If we are passed a NULL io_loop, then we don't setup gconf + // If we are passed a NULL io_loop, then we don't set up gconf // notifications. This should not be the usual case but is intended // to simplify test setups. if (!io_loop_) @@ -612,6 +612,8 @@ void ProxyConfigServiceLinux::Delegate::OnCheckProxyConfigSettings() { this, &ProxyConfigServiceLinux::Delegate::SetNewProxyConfig, new_config)); + // Update the thread-private copy in |reference_config_| as well. + reference_config_ = new_config; } } -- cgit v1.1