From aab1e97f7d0c187e5d518be2ff30b5c33d9a3178 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 6 Feb 2008 00:17:13 +0000
Subject: [PATCH] - GUI RPC: fix some XML errors (missing / in single-tag
 elements)     Fixes #524 (from Nicolas)

svn path=/trunk/boinc/; revision=14682
---
 checkin_notes               | 9 +++++++++
 client/gui_rpc_server_ops.C | 6 +++---
 lib/gui_rpc_client_ops.C    | 4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index b5e03cbbd2..af4f593afc 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1177,3 +1177,12 @@ David  Feb 5 2008
         MainDocument.cpp,h
     lib/
         gui_rpc_client.C,h
+
+David  Feb 5 2008
+    - GUI RPC: fix some XML errors (missing / in single-tag elements)
+        Fixes #524 (from Nicolas)
+
+    client/
+        gui_rpc_server_ops.C
+    lib/
+        gui_rpc_client_ops.C
diff --git a/client/gui_rpc_server_ops.C b/client/gui_rpc_server_ops.C
index 150033869e..764d976253 100644
--- a/client/gui_rpc_server_ops.C
+++ b/client/gui_rpc_server_ops.C
@@ -560,7 +560,7 @@ static void handle_get_cc_status(GUI_RPC_CONN* gr, MIOFILE& fout) {
 
 static void handle_network_available(char*, MIOFILE& fout) {
     net_status.network_available();
-    fout.printf("<success>\n");
+    fout.printf("<success/>\n");
 }
 
 static void handle_get_project_init_status(char*, MIOFILE& fout) {
@@ -1095,7 +1095,7 @@ int GUI_RPC_CONN::handle_rpc() {
     } else if (match_tag(request_msg, "<acct_mgr_info")) {
         handle_acct_mgr_info(request_msg, mf);
     } else if (match_tag(request_msg, "<read_global_prefs_override/>")) {
-        mf.printf("<success>\n");
+        mf.printf("<success/>\n");
         gstate.read_global_prefs();
         gstate.request_schedule_cpus("Preferences override");
         gstate.request_work_fetch("Preferences override");
@@ -1114,7 +1114,7 @@ int GUI_RPC_CONN::handle_rpc() {
     } else if (match_tag(request_msg, "<set_cc_config")) {
         handle_set_cc_config(request_msg, mf);
     } else if (match_tag(request_msg, "<read_cc_config/>")) {
-        mf.printf("<success>\n");
+        mf.printf("<success/>\n");
         read_config_file();
         gstate.request_schedule_cpus("Core client configuration");
         gstate.request_work_fetch("Core client configuration");
diff --git a/lib/gui_rpc_client_ops.C b/lib/gui_rpc_client_ops.C
index 4444630fe4..f34063a0ac 100644
--- a/lib/gui_rpc_client_ops.C
+++ b/lib/gui_rpc_client_ops.C
@@ -1173,7 +1173,7 @@ int RPC_CLIENT::get_simple_gui_info(SIMPLE_GUI_INFO& sgi) {
     sgi.projects.clear();
     sgi.results.clear();
 
-    retval = rpc.do_rpc("<get_simple_gui_info>\n");
+    retval = rpc.do_rpc("<get_simple_gui_info/>\n");
     if (!retval) {
         while (rpc.fin.fgets(buf, 256)) {
             if (match_tag(buf, "</simple_gui_info>")) break;
@@ -1209,7 +1209,7 @@ int RPC_CLIENT::get_simple_gui_info(CC_STATE& state, RESULTS& results) {
 
     results.clear();
 
-    retval = rpc.do_rpc("<get_simple_gui_info>\n");
+    retval = rpc.do_rpc("<get_simple_gui_info/>\n");
     if (!retval) {
 
         // mark all projects for deletion (undo if client still has them)