diff --git a/checkin_notes b/checkin_notes index d860ebaf21..d92e56ce67 100644 --- a/checkin_notes +++ b/checkin_notes @@ -6111,3 +6111,10 @@ Rytis 30 June 2009 sched_config.cpp sched_config.h sched_result.cpp + +Rom 30 June 2009 + - MGR: Remove project list randomization, sort on name. + + lib/ + gui_rpc_client.h + gui_rpc_client_ops.cpp diff --git a/lib/gui_rpc_client.h b/lib/gui_rpc_client.h index 809045ed41..3f80eff7ac 100644 --- a/lib/gui_rpc_client.h +++ b/lib/gui_rpc_client.h @@ -67,7 +67,6 @@ public: std::string image; // URL of logo std::vector platforms; // platforms supported by project, or empty - double rand; PROJECT_LIST_ENTRY(); ~PROJECT_LIST_ENTRY(); @@ -83,10 +82,12 @@ struct AM_LIST_ENTRY { std::string url; std::string description; std::string image; - double rand; + AM_LIST_ENTRY(){} ~AM_LIST_ENTRY(){} + int parse(XML_PARSER&); + bool operator<(const AM_LIST_ENTRY& compare); }; diff --git a/lib/gui_rpc_client_ops.cpp b/lib/gui_rpc_client_ops.cpp index 38a1f79776..f333a564d1 100644 --- a/lib/gui_rpc_client_ops.cpp +++ b/lib/gui_rpc_client_ops.cpp @@ -149,15 +149,14 @@ void PROJECT_LIST_ENTRY::clear() { platforms.clear(); home.clear(); image.clear(); - rand = 0; } bool PROJECT_LIST_ENTRY::operator<(const PROJECT_LIST_ENTRY& compare) { - return rand < compare.rand; + return name < compare.name; } bool AM_LIST_ENTRY::operator<(const AM_LIST_ENTRY& compare) { - return rand < compare.rand; + return name < compare.name; } PROJECT::PROJECT() { @@ -1296,7 +1295,6 @@ int RPC_CLIENT::get_all_projects_list(ALL_PROJECTS_LIST& pl) { project = new PROJECT_LIST_ENTRY(); retval = project->parse(xp); if (!retval) { - project->rand = drand(); pl.projects.push_back(project); } else { delete project; @@ -1306,7 +1304,6 @@ int RPC_CLIENT::get_all_projects_list(ALL_PROJECTS_LIST& pl) { am = new AM_LIST_ENTRY(); retval = am->parse(xp); if (!retval) { - am->rand = drand(); pl.account_managers.push_back(am); } else { delete am;