diff --git a/checkin_notes b/checkin_notes index 5d3106efd8..d3e1e06925 100755 --- a/checkin_notes +++ b/checkin_notes @@ -5187,3 +5187,12 @@ David 27 May 2006 create_account_action.php create_account_form.php get_project_config.php + +David 28 May 2006 + - Add account manager URL to APP_INIT_DATA structure + (so that apps can see what acct mgr is being used, if they want) + + client/ + app_start.C + lib/ + app_ipc.C,h diff --git a/client/app_start.C b/client/app_start.C index f5325863e7..d25051739d 100644 --- a/client/app_start.C +++ b/client/app_start.C @@ -161,6 +161,7 @@ int ACTIVE_TASK::write_app_init_file() { aid.app_version = app_version->version_num; safe_strcpy(aid.app_name, wup->app->name); safe_strcpy(aid.symstore, wup->project->symstore); + safe_strcpy(aid.acct_mgr_url, gstate.acct_mgr_info.acct_mgr_url); safe_strcpy(aid.user_name, wup->project->user_name); safe_strcpy(aid.team_name, wup->project->team_name); if (wup->project->project_specific_prefs.length()) { diff --git a/lib/app_ipc.C b/lib/app_ipc.C index 0110a8058e..022565f430 100755 --- a/lib/app_ipc.C +++ b/lib/app_ipc.C @@ -96,6 +96,9 @@ int write_init_data_file(FILE* f, APP_INIT_DATA& ai) { if (strlen(ai.symstore)) { fprintf(f, "%s\n", ai.symstore); } + if (strlen(ai.acct_mgr_url)) { + fprintf(f, "%s\n", ai.acct_mgr_url); + } if (ai.project_preferences && strlen(ai.project_preferences)) { fprintf(f, "\n%s\n", ai.project_preferences); } @@ -190,6 +193,7 @@ int parse_init_data_file(FILE* f, APP_INIT_DATA& ai) { else if (parse_int(buf, "", ai.app_version)) continue; else if (parse_str(buf, "", ai.app_name, sizeof(ai.app_name))) continue; else if (parse_str(buf, "", ai.symstore, sizeof(ai.symstore))) continue; + else if (parse_str(buf, "", ai.acct_mgr_url, sizeof(ai.acct_mgr_url))) continue; else if (parse_str(buf, "", ai.user_name, sizeof(ai.user_name))) continue; else if (parse_str(buf, "", ai.team_name, sizeof(ai.team_name))) continue; else if (parse_str(buf, "", ai.project_dir, sizeof(ai.project_dir))) continue; diff --git a/lib/app_ipc.h b/lib/app_ipc.h index f077798e41..5679b397b0 100755 --- a/lib/app_ipc.h +++ b/lib/app_ipc.h @@ -162,6 +162,7 @@ struct APP_INIT_DATA { int app_version; char app_name[256]; char symstore[256]; + char acct_mgr_url[256]; char* project_preferences; int userid; int teamid;