From 05c82a1405a22538aff9951181c70c7a3ee081c2 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 20 Feb 2012 21:43:56 +0000 Subject: [PATCH] - Manager: compile fix svn path=/trunk/boinc/; revision=25298 --- checkin_notes | 6 ++++++ clientgui/MainDocument.cpp | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/checkin_notes b/checkin_notes index 5087586813..46748e3fd2 100644 --- a/checkin_notes +++ b/checkin_notes @@ -1917,3 +1917,9 @@ David 20 Feb 2012 gui_rpc_client.h client/ boinc_cmd.cpp + +David 20 Feb 2012 + - Manager: compile fix + + clientgui/ + MainDocument.cpp diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp index f1f4afcdc8..3c221af31e 100644 --- a/clientgui/MainDocument.cpp +++ b/clientgui/MainDocument.cpp @@ -2318,10 +2318,6 @@ int CMainDocument::SetProxyConfiguration() { if (!proxy_info.http_user_name.empty() || !proxy_info.http_user_passwd.empty()) proxy_info.use_http_authentication = true; - proxy_info.socks_version = 4; - if (!proxy_info.socks5_user_name.empty() || !proxy_info.socks5_user_passwd.empty()) - proxy_info.socks_version = 5; - iRetVal = rpc.set_proxy_settings(proxy_info); if (iRetVal) { wxLogTrace(wxT("Function Status"), wxT("CMainDocument::SetProxyInfo - Set Proxy Info Failed '%d'"), iRetVal);