From 58a68280b6c33836ce7d4be4361a8cad7af86f3a Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Thu, 6 Apr 2006 07:52:23 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=9802
---
 checkin_notes                      | 11 +++++++++++
 clientgui/ProxyInfoPage.cpp        |  8 ++++++--
 clientgui/WizardAccountManager.cpp |  1 -
 clientgui/WizardAttachProject.cpp  |  1 -
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 3fec3a89ed..2e43d46e1a 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -3597,3 +3597,14 @@ Rom    5 Apr 2006
         win_screensaver.cpp
     clientgui/
         ViewWork.cpp
+
+Rom    6 Apr 2006
+    - Bug Fix: Add some text about connectivity problems to the proxy
+        into page.
+    - Bug Fix: Remove the code that was keeping the 'Not Found' page from
+        going to the 'Account Info' page.
+        
+    clientgui/
+        ProxyInfoPage.cpp
+        WizardAccountManager.cpp
+        WizardAttachProject.cpp
diff --git a/clientgui/ProxyInfoPage.cpp b/clientgui/ProxyInfoPage.cpp
index 9e2e49544d..012cb999bf 100644
--- a/clientgui/ProxyInfoPage.cpp
+++ b/clientgui/ProxyInfoPage.cpp
@@ -193,11 +193,15 @@ void CErrProxyInfoPage::OnPageChanged( wxWizardExEvent& event ) {
         _("BOINC failed to communicate on the Internet. The most likely\n"
           "reasons are:\n"
           "\n"
-          "1) Personal firewall software is blocking BOINC. You must\n"
+          "1) Connectivity problem.  Please check your network or modem\n"
+          "connection and hit the back button to retry the previous\n"
+          "operation.\n"
+          "\n"
+          "2) Personal firewall software is blocking BOINC. You must\n"
           "configure your personal firewall to let BOINC communicate\n"
           "on port 80. Once this is fixed, click Back to try again.\n"
           "\n"
-          "2) You are using a proxy server and BOINC needs to know\n"
+          "3) You are using a proxy server and BOINC needs to know\n"
           "about it.")
     );
     m_pDirectionsStaticCtrl->SetLabel(
diff --git a/clientgui/WizardAccountManager.cpp b/clientgui/WizardAccountManager.cpp
index 07d76499c5..4cdaf3ea9f 100644
--- a/clientgui/WizardAccountManager.cpp
+++ b/clientgui/WizardAccountManager.cpp
@@ -319,7 +319,6 @@ bool CWizardAccountManager::HasNextPage( wxWizardPageEx* page )
     bNoNextPageDetected |= (page == m_ErrNotDetectedPage);
     bNoNextPageDetected |= (page == m_ErrUnavailablePage);
     bNoNextPageDetected |= (page == m_ErrNoInternetConnectionPage);
-    bNoNextPageDetected |= (page == m_ErrNotFoundPage);
  
     if (bNoNextPageDetected)
         return false;
diff --git a/clientgui/WizardAttachProject.cpp b/clientgui/WizardAttachProject.cpp
index 812de7ec90..350ec73c26 100644
--- a/clientgui/WizardAttachProject.cpp
+++ b/clientgui/WizardAttachProject.cpp
@@ -325,7 +325,6 @@ bool CWizardAttachProject::HasNextPage( wxWizardPageEx* page )
     bNoNextPageDetected |= (page == m_CompletionPage);
     bNoNextPageDetected |= (page == m_CompletionErrorPage);
     bNoNextPageDetected |= (page == m_ErrNotDetectedPage);
-    bNoNextPageDetected |= (page == m_ErrNotFoundPage);
     bNoNextPageDetected |= (page == m_ErrUnavailablePage);
     bNoNextPageDetected |= (page == m_ErrAlreadyAttachedPage);
     bNoNextPageDetected |= (page == m_ErrNoInternetConnectionPage);