Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

tolerate missing </gui_url> 

svn path=/trunk/boinc/; revision=10015
This commit is contained in:
David Anderson 2006-04-22 06:19:04 +00:00
parent 6ad976cba5
commit eed7d9b7f6
6 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
checkin_notes
View File

@ -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 </gui_url> 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

3
clientgui/AccountManagerPropertiesPage.cpp
View File

@ -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:

2
clientgui/BOINCDialupManager.cpp
View File

@ -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;
}
}

2
clientgui/ProjectPropertiesPage.cpp
View File

@ -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;

BIN
doc/rr_sim.odg
View File

Binary file not shown.

6
lib/gui_rpc_client_ops.C
View File

@ -82,6 +82,7 @@ int GUI_URL::parse(MIOFILE& in) {
char buf[256];
while (in.fgets(buf, 256)) {
if (match_tag(buf, "</gui_url>")) return 0;
if (match_tag(buf, "</gui_urls>")) break;
else if (parse_str(buf, "<name>", name)) continue;
else if (parse_str(buf, "<description>", description)) continue;
else if (parse_str(buf, "<url>", url)) continue;
@ -187,9 +188,8 @@ int PROJECT::parse(MIOFILE& in) {
else if (match_tag(buf, "<gui_url>")) {
GUI_URL gu;
retval = gu.parse(in);
if (!retval) {
gui_urls.push_back(gu);
}
if (retval) break;
gui_urls.push_back(gu);
}
}
continue;