From eed7d9b7f6504fa4e7daa8216d1d50f9ba266c0e Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 22 Apr 2006 06:19:04 +0000 Subject: [PATCH] tolerate missing svn path=/trunk/boinc/; revision=10015 --- checkin_notes | 13 +++++++++++++ clientgui/AccountManagerPropertiesPage.cpp | 3 ++- clientgui/BOINCDialupManager.cpp | 2 ++ clientgui/ProjectPropertiesPage.cpp | 2 ++ doc/rr_sim.odg | Bin 9276 -> 9281 bytes lib/gui_rpc_client_ops.C | 6 +++--- 6 files changed, 22 insertions(+), 4 deletions(-) diff --git a/checkin_notes b/checkin_notes index 4116ee1d02..0a244f2fb4 100755 --- a/checkin_notes +++ b/checkin_notes @@ -4146,3 +4146,16 @@ Walt 21 Apr 2006 client/ http_curl.C + +David 21 Apr 2006 + - Kludge to make things work even when a project left out + a tag in its GUI URL list. + - comment out google/yahoo code in the BOINC Manager. + Rom: please finish this job + + clientgui/ + AccountManagerPropertiesPage.cpp + BOINCDialupManager.cpp + ProjectPropertiesPage.cpp + lib/ + gui_rpc_client_ops.C diff --git a/clientgui/AccountManagerPropertiesPage.cpp b/clientgui/AccountManagerPropertiesPage.cpp index 73a488ab23..fcc3061dcc 100644 --- a/clientgui/AccountManagerPropertiesPage.cpp +++ b/clientgui/AccountManagerPropertiesPage.cpp @@ -319,6 +319,7 @@ void CAccountManagerPropertiesPage::OnStateChange( CAccountManagerPropertiesPage SetNextState(ACCTMGRPROP_COMMUNICATEYAHOO_BEGIN); } break; +#if 0 case ACCTMGRPROP_COMMUNICATEYAHOO_BEGIN: SetNextState(ACCTMGRPROP_COMMUNICATEYAHOO_EXECUTE); break; @@ -384,7 +385,7 @@ void CAccountManagerPropertiesPage::OnStateChange( CAccountManagerPropertiesPage } else { SetCommunicateGoogleSucceeded(false); } - +#endif SetNextState(ACCTMGRPROP_DETERMINENETWORKSTATUS_BEGIN); break; case ACCTMGRPROP_DETERMINENETWORKSTATUS_BEGIN: diff --git a/clientgui/BOINCDialupManager.cpp b/clientgui/BOINCDialupManager.cpp index 22fe6f6410..0fc5174897 100644 --- a/clientgui/BOINCDialupManager.cpp +++ b/clientgui/BOINCDialupManager.cpp @@ -248,11 +248,13 @@ void CBOINCDialUpManager::poll() { wxTimeSpan tsTimeout = wxDateTime::Now() - m_dtDialupConnectionTimeout; if (30 > tsTimeout.GetSeconds()) { if(m_iConnectAttemptRetVal != BOINC_SUCCESS) { +#if 0 if (m_iConnectAttemptRetVal != ERR_IN_PROGRESS) { // Attempt to successfully download the Google homepage pDoc->rpc.lookup_website(LOOKUP_GOOGLE); } m_iConnectAttemptRetVal = pDoc->rpc.lookup_website_poll(); +#endif return; } } diff --git a/clientgui/ProjectPropertiesPage.cpp b/clientgui/ProjectPropertiesPage.cpp index fc6323e19d..b0fd1fa086 100644 --- a/clientgui/ProjectPropertiesPage.cpp +++ b/clientgui/ProjectPropertiesPage.cpp @@ -457,6 +457,7 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& event ) SetNextState(PROJPROP_COMMUNICATEYAHOO_BEGIN); } break; +#if 0 case PROJPROP_COMMUNICATEYAHOO_BEGIN: SetNextState(PROJPROP_COMMUNICATEYAHOO_EXECUTE); break; @@ -525,6 +526,7 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& event ) SetNextState(PROJPROP_DETERMINENETWORKSTATUS_BEGIN); break; +#endif case PROJPROP_DETERMINENETWORKSTATUS_BEGIN: SetNextState(PROJPROP_DETERMINENETWORKSTATUS_EXECUTE); break; diff --git a/doc/rr_sim.odg b/doc/rr_sim.odg index 32857de6ae526562956c8f31c9489ae7ea996358..0f137b9052c8964825d58578ac85c18b5ee8156a 100644 GIT binary patch delta 4525 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 diff --git a/lib/gui_rpc_client_ops.C b/lib/gui_rpc_client_ops.C index 52b8eb9cfe..758ef51d7d 100644 --- a/lib/gui_rpc_client_ops.C +++ b/lib/gui_rpc_client_ops.C @@ -82,6 +82,7 @@ int GUI_URL::parse(MIOFILE& in) { char buf[256]; while (in.fgets(buf, 256)) { if (match_tag(buf, "")) return 0; + if (match_tag(buf, "")) break; else if (parse_str(buf, "", name)) continue; else if (parse_str(buf, "", description)) continue; else if (parse_str(buf, "", url)) continue; @@ -187,9 +188,8 @@ int PROJECT::parse(MIOFILE& in) { else if (match_tag(buf, "")) { GUI_URL gu; retval = gu.parse(in); - if (!retval) { - gui_urls.push_back(gu); - } + if (retval) break; + gui_urls.push_back(gu); } } continue;