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

Fix compile errors within _WCG ifdefs 

svn path=/trunk/boinc/; revision=20342
This commit is contained in:
Kevin Reed 2010-02-01 18:42:00 +00:00
parent ce2b061ddf
commit 86944f41a5
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
clientgui/ProxyInfoPage.cpp
View File

@ -196,20 +196,7 @@ void CErrProxyInfoPage::OnPageChanged( wxWizardExEvent& event ) {
);
#if defined (_WCG)
m_pDescriptionStaticCtrl->SetLabel(
_("The World Community Grid - BOINC software failed to communicate\n"
"over the Internet. The most likely reasons are:\n"
"\n"
"1) Connectivity problem. Check your network or modem connection\n"
"and then click Back to try again.\n"
"\n"
"2) Personal firewall software is blocking the World Community\n"
"Grid - BOINC software. Configure your personal firewall to let\n"
"BOINC and BOINC Manager communicate on port 80 and port 443,\n"
"then click Back to try again.\n"
"\n"
"3) You are using a proxy server.\n"
"Click Next to configure BOINC's proxy settings."
)
_("The World Community Grid - BOINC software failed to communicate\nover the Internet. The most likely reasons are:\n\n1) Connectivity problem. Check your network or modem connection\nand then click Back to try again.\n\n2) Personal firewall software is blocking the World Community\nGrid - BOINC software. Configure your personal firewall to let\nBOINC and BOINC Manager communicate on port 80 and port 443,\nhen click Back to try again.\n\n3) You are using a proxy server.\nClick Next to configure BOINC's proxy settings.")
);
#else
m_pDescriptionStaticCtrl->SetLabel(

3
clientgui/WelcomePage.cpp
View File

@ -244,7 +244,8 @@ void CWelcomePage::OnPageChanged( wxWizardExEvent& event ) {
#if defined (_WCG)
// Determine if we are the World Community Grid version of the client
// and connected to World Community Grid
if ( pDoc->state.lookup_project("http://www.worldcommunitygrid.org/") ) {
std::string wcgUrl = "http://www.worldcommunitygrid.org/";
if ( pDoc->state.lookup_project(wcgUrl) ) {
is_wcg_client = true;
}
#endif