From 63dfde353e3bed444a04519025f8ac0152f9d2ec Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Mon, 2 Mar 2009 17:57:57 +0000
Subject: [PATCH] svn path=/trunk/boinc/; revision=17421

---
 checkin_notes              | 39 ++++++++++++++++++++++++++------------
 client/cs_statefile.cpp    | 12 ++++++++----
 clientgui/AsyncRPC.cpp     |  1 +
 lib/gui_rpc_client_ops.cpp |  5 -----
 4 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 942a25e715..30296997a8 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -2319,15 +2319,15 @@ David  26 Feb 2009
         cs_scheduler.cpp
 
 David  26 Feb 2009
-	- screensaver: show correct info if CPU throttling;
-		show correct window title;
-		show "no projects" message.
+    - screensaver: show correct info if CPU throttling;
+        show correct window title;
+        show "no projects" message.
 
-	api/
-		graphics2.h
-		graphics2_win.cpp
-	clientscr/
-		ss_app.cpp
+    api/
+        graphics2.h
+        graphics2_win.cpp
+    clientscr/
+        ss_app.cpp
 
 David  26 Feb 2009
     - boinccmd: make --get_messages output more readable
@@ -2336,7 +2336,7 @@ David  26 Feb 2009
         boinc_cmd.cpp
 
 Charlie 27 Feb 2009
-	- screensaver: remove from the coordinator error codes and messages 
+    - screensaver: remove from the coordinator error codes and messages 
         which will now be handled by default graphics app, add new error 
         codes for problems in default graphics app.
     - Mac screensaver: improve logic to stop drawing BOINC logo when a 
@@ -2350,10 +2350,10 @@ Charlie 27 Feb 2009
         screensaver_win.h
 
 David  27 Feb 2009
-	- manager: fix roundoff error in Advanced Prefs; fixes #613
+    - manager: fix roundoff error in Advanced Prefs; fixes #613
 
-	clientgui/
-		DlgAdvPreferences.cpp
+    clientgui/
+        DlgAdvPreferences.cpp
 
 Rom    27 Feb 2009
     - MGR: Make CTRL-SHIFT-A the accelerator in the simple GUI that
@@ -2441,3 +2441,18 @@ David  1 Mar 2009
     lib/
         gui_rpc_client.h
         gui_rpc_client_ops.cpp
+
+David  2 Mar 2009
+    - fix bugs in the above.
+    - GUI RPC: remove unused items from get_state RPC: host_info, time_stats,
+        net_stats, host_venue
+
+    NOTE: any change to a GUI RPC struct requires changing AsyncRPC.cpp.
+    This is undesirable.
+
+    client/
+        cs_statefile.cpp
+    clientgui/
+        AsyncRPC.cpp
+    lib/
+        gui_rpc_client_ops.cpp
diff --git a/client/cs_statefile.cpp b/client/cs_statefile.cpp
index 11193602b4..ada3253b2f 100644
--- a/client/cs_statefile.cpp
+++ b/client/cs_statefile.cpp
@@ -789,12 +789,14 @@ int CLIENT_STATE::write_state_gui(MIOFILE& f) {
 
     f.printf("<client_state>\n");
 
+#if 0
     retval = host_info.write(f, false);
     if (retval) return retval;
     retval = time_stats.write(f, false);
     if (retval) return retval;
     retval = net_stats.write(f);
     if (retval) return retval;
+#endif
 
     for (j=0; j<projects.size(); j++) {
         PROJECT* p = projects[j];
@@ -821,14 +823,14 @@ int CLIENT_STATE::write_state_gui(MIOFILE& f) {
         "<core_client_major_version>%d</core_client_major_version>\n"
         "<core_client_minor_version>%d</core_client_minor_version>\n"
         "<core_client_release>%d</core_client_release>\n"
-        "%s"
-        "%s",
+        "<executing_as_daemon>%d</executing_as_daemon>\n"
+        "<have_cuda>%d</have_cuda>\n",
         get_primary_platform(),
         core_client_version.major,
         core_client_version.minor,
         core_client_version.release,
-        executing_as_daemon?"<executing_as_daemon/>\n":"",
-        work_fetch_no_new_work?"<work_fetch_no_new_work/>\n":""
+        executing_as_daemon?1:0,
+        coproc_cuda?1:0
     );
     for (i=0; i<platforms.size(); i++) {
         f.printf(
@@ -838,9 +840,11 @@ int CLIENT_STATE::write_state_gui(MIOFILE& f) {
 
     global_prefs.write(f);
 
+#if 0
     if (strlen(main_host_venue)) {
         f.printf("<host_venue>%s</host_venue>\n", main_host_venue);
     }
+#endif
 
     f.printf("</client_state>\n");
     return 0;
diff --git a/clientgui/AsyncRPC.cpp b/clientgui/AsyncRPC.cpp
index 6154f9b375..2caf0a6bc1 100755
--- a/clientgui/AsyncRPC.cpp
+++ b/clientgui/AsyncRPC.cpp
@@ -728,6 +728,7 @@ void CMainDocument::HandleCompletedRPC() {
                 exchangeBuf->global_prefs = arg1->global_prefs;
                 exchangeBuf->version_info = arg1->version_info;
                 exchangeBuf->executing_as_daemon = arg1->executing_as_daemon;
+                exchangeBuf->have_cuda = arg1->have_cuda;
             }
             break;
         case RPC_GET_RESULTS:
diff --git a/lib/gui_rpc_client_ops.cpp b/lib/gui_rpc_client_ops.cpp
index 8cab3f1095..ea68bd2d42 100644
--- a/lib/gui_rpc_client_ops.cpp
+++ b/lib/gui_rpc_client_ops.cpp
@@ -1086,11 +1086,6 @@ int RPC_CLIENT::get_state(CC_STATE& state) {
             }
             if (match_tag(buf, "</client_state>")) break;
 
-            // the following are to handle responses from pre-5.6 core clients
-            // remove them 6/07
-            if (parse_int(buf, "<major_version>", state.version_info.major)) continue;
-            if (parse_int(buf, "<minor_version>", state.version_info.minor)) continue;
-            if (parse_int(buf, "<release>", state.version_info.release)) continue;
             if (parse_bool(buf, "executing_as_daemon", state.executing_as_daemon)) continue;
             if (parse_bool(buf, "have_cuda", state.have_cuda)) continue;
             if (match_tag(buf, "<project>")) {