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

- MGR: Newer versions of the server-side software publish their 

master url in the response to the get_project_config.php
        request.  If it exists use it over what was specified
        by the user.  Fixes #259
        
    clientgui/
        AccountManagerProcessingPage.cpp
        ProjectProcessingPage.cpp

svn path=/trunk/boinc/; revision=17513
This commit is contained in:
Rom Walton 2009-03-05 21:36:35 +00:00
parent d6cab7309e
commit c626f48aae
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
checkin_notes
View File

@ -2741,3 +2741,13 @@ Rom 5 Mar 2009
clientgui/
AccountManagerPropertiesPage.cpp
ProjectPropertiesPage.cpp
Rom 5 Mar 2009
- MGR: Newer versions of the server-side software publish their
master url in the response to the get_project_config.php
request. If it exists use it over what was specified
by the user. Fixes #259
clientgui/
AccountManagerProcessingPage.cpp
ProjectProcessingPage.cpp

11
clientgui/AccountManagerProcessingPage.cpp
View File

@ -257,7 +257,16 @@ void CAccountManagerProcessingPage::OnStateChange( CAccountManagerProcessingPage
break;
case ATTACHACCTMGR_ATTACHACCTMGR_EXECUTE:
// Attempt to attach to the accout manager.
url = (const char*)pWAM->m_AccountManagerInfoPage->GetProjectURL().mb_str();
// Newer versions of the server-side software contain the correct
// master url in the get_project_config response. If it is available
// use it instead of what the user typed in.
if (!pWAM->project_config.master_url.empty()) {
url = pWAM->project_config.master_url;
} else {
url = (const char*)pWAM->m_AccountManagerInfoPage->GetProjectURL().mb_str();
}
username = (const char*)pWAM->m_AccountInfoPage->GetAccountEmailAddress().mb_str();
password = (const char*)pWAM->m_AccountInfoPage->GetAccountPassword().mb_str();
pDoc->rpc.acct_mgr_rpc(

9
clientgui/ProjectProcessingPage.cpp
View File

@ -381,7 +381,14 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
ai->clear();
ao->clear();
ai->url = (const char*)pWAP->m_ProjectInfoPage->GetProjectURL().mb_str();
// Newer versions of the server-side software contain the correct
// master url in the get_project_config response. If it is available
// use it instead of what the user typed in.
if (!pWAP->project_config.master_url.empty()) {
ai->url = pWAP->project_config.master_url;
} else {
ai->url = (const char*)pWAP->m_ProjectInfoPage->GetProjectURL().mb_str();
}
if (!pWAP->GetProjectAuthenticator().IsEmpty() ||
pWAP->m_bCredentialsCached ||