From 2c0d202201fe85c9cd0733bcb8843fd515a0a675 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Wed, 22 Feb 2006 18:20:25 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=9527
---
 checkin_notes                       | 13 +++++++++++++
 clientgui/ProjectProcessingPage.cpp |  4 ++--
 lib/gui_rpc_client_ops.C            |  4 +---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index ab5aa60007..185723fdac 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -2212,3 +2212,16 @@ Charlie 22 Feb 2006
     mac_build/
         HowToBuildBOINC_XCode.rtf
         setupForBOINC.sh
+
+Rom    22 Feb 2005
+    - Bug Fix: ACCOUNT_OUT::parse should not return after encountering the
+        error_num element.
+    - Bug Fix: Make sure we are looking at the ACCOUNT_OUT messages array
+        instead of the attach to project response.
+        
+    clientgui/
+        ProjectProcessingPage.cpp
+    lib/
+        gui_rpc_client_ops.C
+
+
diff --git a/clientgui/ProjectProcessingPage.cpp b/clientgui/ProjectProcessingPage.cpp
index 4f52e52d30..643ba30f2b 100644
--- a/clientgui/ProjectProcessingPage.cpp
+++ b/clientgui/ProjectProcessingPage.cpp
@@ -470,8 +470,8 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& event )
                         pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->SetLabel(strBuffer);
                     } else if (BOINC_SUCCESS != ao->error_num) {
                         strBuffer = pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->GetLabel();
-                        for (i=0; i<reply.messages.size(); i++) {
-                            strBuffer += wxString(reply.messages[i].c_str()) + wxString(wxT("\n"));
+                        for (i=0; i<ao->messages.size(); i++) {
+                            strBuffer += wxString(ao->messages[i].c_str()) + wxString(wxT("\n"));
                         }
                         pWAP->m_CompletionErrorPage->m_pServerMessagesCtrl->SetLabel(strBuffer);
                     }
diff --git a/lib/gui_rpc_client_ops.C b/lib/gui_rpc_client_ops.C
index 69b49dcc91..0fde322c38 100644
--- a/lib/gui_rpc_client_ops.C
+++ b/lib/gui_rpc_client_ops.C
@@ -878,12 +878,10 @@ ACCOUNT_OUT::~ACCOUNT_OUT() {
 int ACCOUNT_OUT::parse(MIOFILE& in) {
     char buf[256];
     std::string msg;
-
     clear();
-
     while (in.fgets(buf, 256)) {
         if (match_tag(buf, "</account_out>")) return 0; 
-        else if (parse_int(buf, "<error_num>", error_num)) return error_num;
+        else if (parse_int(buf, "<error_num>", error_num)) continue;
         else if (parse_str(buf, "<authenticator>", authenticator)) continue;
         else if (parse_str(buf, "<message>", msg)) {
             messages.push_back(msg);