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

- manager: Communitcations -> Communications. 

please, no spelling errors in function/variable names
- client: parse deprecated tags in <file_info>


svn path=/trunk/boinc/; revision=24058
This commit is contained in:
David Anderson 2011-08-27 18:07:28 +00:00
parent abdb603bc4
commit bd0897b92c
6 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
checkin_notes
View File

@ -5170,3 +5170,14 @@ David 26 Aug 2011
lib/
crypt.cpp
parse.cpp,h
David 26 Aug 2011
- manager: Communitcations -> Communications.
please, no spelling errors in function/variable names
- client: parse deprecated tags in <file_info>
clientgui/
ProjectProcessingPage.cpp,h
AccountManagerProcessingPage.cpp,h
client/
client_types.cpp

3
client/client_types.cpp
View File

@ -1038,6 +1038,9 @@ int FILE_INFO::parse(XML_PARSER& xp) {
error_msg = buf2;
continue;
}
// deprecated tags
if (xp.parse_bool("generated_locally", btemp)) continue;
if (xp.parse_bool("upload_when_present", btemp)) continue;
if (log_flags.unparsed_xml) {
msg_printf(0, MSG_INFO,
"[unparsed_xml] FILE_INFO::parse(): unrecognized: %s\n",

6
clientgui/AccountManagerProcessingPage.cpp
View File

@ -108,7 +108,7 @@ bool CAccountManagerProcessingPage::Create( CBOINCBaseWizard* parent )
m_pProgressIndicator = NULL;
////@end CAccountManagerProcessingPage member initialisation
m_bProjectCommunitcationsSucceeded = false;
m_bProjectCommunicationsSucceeded = false;
m_bProjectUnavailable = false;
m_bProjectAccountNotFound = false;
m_bProjectAccountAlreadyExists = false;
@ -200,7 +200,7 @@ void CAccountManagerProcessingPage::OnPageChanged( wxWizardExEvent& event )
_("Please wait...")
);
SetProjectCommunitcationsSucceeded(false);
SetProjectCommunicationsSucceeded(false);
SetProjectUnavailable(false);
SetProjectAccountAlreadyExists(false);
SetNextState(ATTACHACCTMGR_INIT);
@ -377,7 +377,7 @@ wxWizardPageEx* CAccountManagerProcessingPage::GetNext() const
} else if (GetProjectAttachSucceeded()) {
// We were successful in creating or retrieving an account
return PAGE_TRANSITION_NEXT(ID_COMPLETIONPAGE);
} else if (!GetProjectCommunitcationsSucceeded() && GetProjectAccountNotFound()) {
} else if (!GetProjectCommunicationsSucceeded() && GetProjectAccountNotFound()) {
// The requested account does not exist or the password is bad
return PAGE_TRANSITION_NEXT(ID_ERRNOTFOUNDPAGE);
} else {

6
clientgui/AccountManagerProcessingPage.h
View File

@ -104,8 +104,8 @@ public:
wxIcon GetIconResource( const wxString& name );
////@end CAccountManagerProcessingPage member function declarations
bool GetProjectCommunitcationsSucceeded() const { return m_bProjectCommunitcationsSucceeded ; }
void SetProjectCommunitcationsSucceeded(bool value) { m_bProjectCommunitcationsSucceeded = value ; }
bool GetProjectCommunicationsSucceeded() const { return m_bProjectCommunicationsSucceeded ; }
void SetProjectCommunicationsSucceeded(bool value) { m_bProjectCommunicationsSucceeded = value ; }
bool GetProjectUnavailable() const { return m_bProjectUnavailable ; }
void SetProjectUnavailable(bool value) { m_bProjectUnavailable = value ; }
@ -135,7 +135,7 @@ public:
wxStaticText* m_pPleaseWaitStaticCtrl;
wxStaticBitmap* m_pProgressIndicator;
////@end CAccountManagerProcessingPage member variables
bool m_bProjectCommunitcationsSucceeded;
bool m_bProjectCommunicationsSucceeded;
bool m_bProjectUnavailable;
bool m_bProjectAccountNotFound;
bool m_bProjectAccountAlreadyExists;

16
clientgui/ProjectProcessingPage.cpp
View File

@ -107,7 +107,7 @@ bool CProjectProcessingPage::Create( CBOINCBaseWizard* parent )
m_pProgressIndicator = NULL;
////@end CProjectProcessingPage member initialisation
m_bProjectCommunitcationsSucceeded = false;
m_bProjectCommunicationsSucceeded = false;
m_bProjectUnavailable = false;
m_bProjectAccountNotFound = false;
m_bProjectAccountAlreadyExists = false;
@ -182,10 +182,10 @@ wxWizardPageEx* CProjectProcessingPage::GetNext() const
} else if (GetProjectAttachSucceeded()) {
// We were successful in creating or retrieving an account
return PAGE_TRANSITION_NEXT(ID_COMPLETIONPAGE);
} else if (!GetProjectCommunitcationsSucceeded() && GetProjectAccountAlreadyExists()) {
} else if (!GetProjectCommunicationsSucceeded() && GetProjectAccountAlreadyExists()) {
// The requested account already exists
return PAGE_TRANSITION_NEXT(ID_ERRALREADYEXISTSPAGE);
} else if (!GetProjectCommunitcationsSucceeded() && GetProjectAccountNotFound()) {
} else if (!GetProjectCommunicationsSucceeded() && GetProjectAccountNotFound()) {
// The requested account does not exist or the password is bad
return PAGE_TRANSITION_NEXT(ID_ERRNOTFOUNDPAGE);
} else {
@ -321,7 +321,7 @@ void CProjectProcessingPage::OnPageChanged( wxWizardExEvent& event ) {
_("Communicating with project.")
);
SetProjectCommunitcationsSucceeded(false);
SetProjectCommunicationsSucceeded(false);
SetProjectUnavailable(false);
SetProjectAccountAlreadyExists(false);
SetNextState(ATTACHPROJECT_INIT);
@ -395,7 +395,7 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
if (!pWA->m_bCredentialsCached || pWA->m_bCredentialsDetected) {
ao->authenticator = (const char*)pWA->GetProjectAuthenticator().mb_str();
}
SetProjectCommunitcationsSucceeded(true);
SetProjectCommunicationsSucceeded(true);
} else {
// Setup initial values for both the create and lookup API
@ -474,9 +474,9 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
}
if ((!iReturnValue) && !ao->error_num) {
SetProjectCommunitcationsSucceeded(true);
SetProjectCommunicationsSucceeded(true);
} else {
SetProjectCommunitcationsSucceeded(false);
SetProjectCommunicationsSucceeded(false);
if ((ao->error_num == ERR_DB_NOT_UNIQUE)
|| (ao->error_num == ERR_NONUNIQUE_EMAIL)
@ -518,7 +518,7 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
SetNextState(ATTACHPROJECT_ATTACHPROJECT_EXECUTE);
break;
case ATTACHPROJECT_ATTACHPROJECT_EXECUTE:
if (GetProjectCommunitcationsSucceeded()) {
if (GetProjectCommunicationsSucceeded()) {
// Wait until we are done processing the request.
dtStartExecutionTime = wxDateTime::Now();

6
clientgui/ProjectProcessingPage.h
View File

@ -106,8 +106,8 @@ public:
wxIcon GetIconResource( const wxString& name );
////@end CProjectProcessingPage member function declarations
bool GetProjectCommunitcationsSucceeded() const { return m_bProjectCommunitcationsSucceeded ; }
void SetProjectCommunitcationsSucceeded(bool value) { m_bProjectCommunitcationsSucceeded = value ; }
bool GetProjectCommunicationsSucceeded() const { return m_bProjectCommunicationsSucceeded ; }
void SetProjectCommunicationsSucceeded(bool value) { m_bProjectCommunicationsSucceeded = value ; }
bool GetProjectUnavailable() const { return m_bProjectUnavailable ; }
void SetProjectUnavailable(bool value) { m_bProjectUnavailable = value ; }
@ -136,7 +136,7 @@ public:
wxStaticText* m_pTitleStaticCtrl;
wxStaticBitmap* m_pProgressIndicator;
////@end CProjectProcessingPage member variables
bool m_bProjectCommunitcationsSucceeded;
bool m_bProjectCommunicationsSucceeded;
bool m_bProjectUnavailable;
bool m_bProjectAccountNotFound;
bool m_bProjectAccountAlreadyExists;