diff --git a/checkin_notes b/checkin_notes index 5159d0742c..3a9fc2a7fb 100755 --- a/checkin_notes +++ b/checkin_notes @@ -1796,3 +1796,13 @@ Rom 13 Feb 2006 clientgui/ BOINCDialupManager.cpp + +David 14 Feb 2006 + - fix bug that broke account manager attach + - removed 2nd arg (CurlError) from handle_reply functions. + We were using this to check for DNS failure, + but we're not doing this anymore. + + client/ + acct_setup.C,h + gui_http.C,h diff --git a/client/acct_setup.C b/client/acct_setup.C index 0dd3f3c10f..17c3a38c0f 100644 --- a/client/acct_setup.C +++ b/client/acct_setup.C @@ -101,7 +101,7 @@ int GET_PROJECT_CONFIG_OP::do_rpc(string master_url) { return retval; } -void GET_PROJECT_CONFIG_OP::handle_reply(int http_op_retval, int) { +void GET_PROJECT_CONFIG_OP::handle_reply(int http_op_retval) { if (http_op_retval) { error_num = http_op_retval; } else { @@ -130,7 +130,7 @@ int LOOKUP_ACCOUNT_OP::do_rpc(ACCOUNT_IN& ai) { return retval; } -void LOOKUP_ACCOUNT_OP::handle_reply(int http_op_retval, int) { +void LOOKUP_ACCOUNT_OP::handle_reply(int http_op_retval) { if (http_op_retval) { error_num = http_op_retval; } else { @@ -159,7 +159,7 @@ int CREATE_ACCOUNT_OP::do_rpc(ACCOUNT_IN& ai) { return retval; } -void CREATE_ACCOUNT_OP::handle_reply(int http_op_retval, int) { +void CREATE_ACCOUNT_OP::handle_reply(int http_op_retval) { if (http_op_retval) { error_num = http_op_retval; } else { @@ -187,7 +187,7 @@ int LOOKUP_WEBSITE_OP::do_rpc(string& url) { return retval; } -void LOOKUP_WEBSITE_OP::handle_reply(int http_op_retval, int CurlResult) { +void LOOKUP_WEBSITE_OP::handle_reply(int http_op_retval) { error_num = http_op_retval; // if we couldn't contact a reference web site, @@ -196,7 +196,7 @@ void LOOKUP_WEBSITE_OP::handle_reply(int http_op_retval, int CurlResult) { // Set a flag that will signal the Manager to that effect // if (checking_network) { - if (CurlResult) { + if (http_op_retval) { gstate.need_physical_connection = true; msg_printf(0, MSG_INFO, "Network check: failure"); } else { @@ -252,7 +252,7 @@ static bool parse_version(FILE* f, char* new_version) { return false; } -void GET_CURRENT_VERSION_OP::handle_reply(int http_op_retval, int) { +void GET_CURRENT_VERSION_OP::handle_reply(int http_op_retval) { char buf[256], new_version[256]; if (http_op_retval) { error_num = http_op_retval; diff --git a/client/acct_setup.h b/client/acct_setup.h index a1396ca352..0c0be39aaa 100644 --- a/client/acct_setup.h +++ b/client/acct_setup.h @@ -56,7 +56,7 @@ struct GET_PROJECT_CONFIG_OP: public GUI_HTTP_OP { virtual ~GET_PROJECT_CONFIG_OP(){} int do_rpc(string url); - virtual void handle_reply(int http_op_retval, int); + virtual void handle_reply(int http_op_retval); GET_PROJECT_CONFIG_OP(){error_num = BOINC_SUCCESS;} }; @@ -66,7 +66,7 @@ struct LOOKUP_ACCOUNT_OP: public GUI_HTTP_OP { virtual ~LOOKUP_ACCOUNT_OP(){} int do_rpc(ACCOUNT_IN&); - virtual void handle_reply(int http_op_retval, int); + virtual void handle_reply(int http_op_retval); LOOKUP_ACCOUNT_OP(){error_num = BOINC_SUCCESS;} }; @@ -76,7 +76,7 @@ struct CREATE_ACCOUNT_OP: public GUI_HTTP_OP { virtual ~CREATE_ACCOUNT_OP(){} int do_rpc(ACCOUNT_IN&); - virtual void handle_reply(int http_op_retval, int); + virtual void handle_reply(int http_op_retval); CREATE_ACCOUNT_OP(){error_num = BOINC_SUCCESS;} }; @@ -86,7 +86,7 @@ struct LOOKUP_WEBSITE_OP: public GUI_HTTP_OP { virtual ~LOOKUP_WEBSITE_OP(){} int do_rpc(std::string&); - virtual void handle_reply(int http_op_retval, int); + virtual void handle_reply(int http_op_retval); LOOKUP_WEBSITE_OP(){ error_num = BOINC_SUCCESS; checking_network = false; @@ -98,7 +98,7 @@ struct GET_CURRENT_VERSION_OP: public GUI_HTTP_OP { virtual ~GET_CURRENT_VERSION_OP(){} int do_rpc(); - virtual void handle_reply(int http_op_retval, int); + virtual void handle_reply(int http_op_retval); GET_CURRENT_VERSION_OP(){error_num = BOINC_SUCCESS;} }; diff --git a/client/gui_http.C b/client/gui_http.C index cfa387b592..3040d41d64 100644 --- a/client/gui_http.C +++ b/client/gui_http.C @@ -74,7 +74,7 @@ bool GUI_HTTP::poll() { if (http_op.http_op_state == HTTP_STATE_DONE) { gstate.http_ops->remove(&http_op); - gui_http_op->handle_reply(http_op.http_op_retval, http_op.CurlResult); + gui_http_op->handle_reply(http_op.http_op_retval); gui_http_op = NULL; state = GUI_HTTP_STATE_IDLE; } diff --git a/client/gui_http.h b/client/gui_http.h index 46da700195..64e882d8b6 100644 --- a/client/gui_http.h +++ b/client/gui_http.h @@ -31,7 +31,7 @@ using std::string; // base class for various types of ops // struct GUI_HTTP_OP { - virtual void handle_reply(int, int) {} + virtual void handle_reply(int) {} GUI_HTTP_OP(){} virtual ~GUI_HTTP_OP(){} };