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

MGR: Fix for converting std::string to wxString for Mac and Linux. 

MGR: Add missing commit from previous merge for the cookieless install scenario.
This commit is contained in:
Rom Walton 2016-02-10 10:46:48 -05:00
parent a2f58bf7c8
commit 4d2e6a041f
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/gui_rpc_server_ops.cpp
View File

@ -732,12 +732,14 @@ static void handle_get_project_init_status(GUI_RPC_CONN& grc) {
" <url>%s</url>\n"
" <name>%s</name>\n"
" <team_name>%s</team_name>\n"
" <setup_cookie>%s</setup_cookie>\n"
" %s\n"
" %s\n"
"</get_project_init_status>\n",
gstate.project_init.url,
gstate.project_init.name,
gstate.project_init.team_name,
gstate.project_init.setup_cookie,
strlen(gstate.project_init.account_key)?"<has_account_key/>":"",
gstate.project_init.embedded?"<embedded/>":""
);

7
clientgui/AdvancedFrame.cpp
View File

@ -1888,8 +1888,9 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
} else if ((0 >= pDoc->GetProjectCount()) && !status.disallow_attach) {
if (pis.url.size() > 0) {
strProjectName = pis.name;
strProjectURL = pis.url;
strProjectName = pis.name.c_str();
strProjectURL = pis.url.c_str();
strProjectSetupCookie = pis.setup_cookie.c_str();
bAccountKeyDetected = pis.has_account_key;
bEmbedded = pis.embedded;
@ -1912,7 +1913,7 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
pWizard = new CWizardAttach(this);
if ( strProjectURL.size() &&
(strProjectAuthenticator.size() || strProjectSetupCookie.size()) &&
//(strProjectAuthenticator.size() || strProjectSetupCookie.size()) &&
!pDoc->project((char*)strProjectURL.c_str())
){
if (pWizard->Run(

5
clientgui/sg_BoincSimpleFrame.cpp
View File

@ -813,8 +813,9 @@ void CSimpleFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
} else if ((0 >= pDoc->GetProjectCount()) && !status.disallow_attach) {
if (pis.url.size() > 0) {
strProjectName = pis.name;
strProjectURL = pis.url;
strProjectName = pis.name.c_str();
strProjectURL = pis.url.c_str();
strProjectSetupCookie = pis.setup_cookie.c_str();
bAccountKeyDetected = pis.has_account_key;
bEmbedded = pis.embedded;

1
lib/gui_rpc_client.h
View File

@ -514,6 +514,7 @@ struct PROJECT_INIT_STATUS {
std::string url;
std::string name;
std::string team_name;
std::string setup_cookie;
bool has_account_key;
bool embedded;

5
lib/gui_rpc_client_ops.cpp
View File

@ -1263,7 +1263,9 @@ int PROJECT_INIT_STATUS::parse(XML_PARSER& xp) {
if (xp.parse_string("url", url)) continue;
if (xp.parse_string("name", name)) continue;
if (xp.parse_string("team_name", team_name)) continue;
if (xp.parse_string("setup_cookie", setup_cookie)) continue;
if (xp.parse_bool("has_account_key", has_account_key)) continue;
if (xp.parse_bool("embedded", embedded)) continue;
}
return ERR_XML_PARSE;
}
@ -1271,7 +1273,10 @@ int PROJECT_INIT_STATUS::parse(XML_PARSER& xp) {
void PROJECT_INIT_STATUS::clear() {
url.clear();
name.clear();
team_name.clear();
setup_cookie.clear();
has_account_key = false;
embedded = false;
}
PROJECT_CONFIG::PROJECT_CONFIG() {