From 088d462e361f38d5b276c0c8a54633053fd78ff4 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Thu, 2 Dec 2004 21:55:04 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=4708 --- checkin_notes | 3 +++ clientgui/MainFrame.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/checkin_notes b/checkin_notes index 6f52063b6b..81b3b37c7b 100755 --- a/checkin_notes +++ b/checkin_notes @@ -20515,6 +20515,9 @@ Rom 2 Dec 2004 message was logged. - Cleanup some of the statusbar update code, wxWidgets already had a function to do that work. + - Bug Fix: Fix the socks proxy enable button, it was referencing the HTTP proxy + control instead of the socks proxy control. ( I thought I had fixed this + awhile ago ) client/win/ win_screensaver.cpp diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp index f235be7201..6a0db6b65c 100644 --- a/clientgui/MainFrame.cpp +++ b/clientgui/MainFrame.cpp @@ -650,8 +650,8 @@ void CMainFrame::OnToolsOptions( wxCommandEvent& WXUNUSED(event) ) pDoc->SetProxyHTTPUserName( strBuffer ); strBuffer = pDlg->m_HTTPPasswordCtrl->GetValue(); pDoc->SetProxyHTTPPassword( strBuffer ); - bBuffer = pDlg->m_EnableHTTPProxyCtrl->GetValue(); + bBuffer = pDlg->m_EnableSOCKSProxyCtrl->GetValue(); pDoc->SetProxySOCKSProxyEnabled( bBuffer ); strBuffer = pDlg->m_SOCKSAddressCtrl->GetValue(); pDoc->SetProxySOCKSServerName( strBuffer );