*** empty log message ***

svn path=/trunk/boinc/; revision=8240

checkin_notes

@@ -12236,3 +12236,15 @@ David   27 Sept 2005
 
 	client/
 		client_state.C
+
+Rom    27 Sept 2005
+    - Some more cleanup.
+    - Remove old dialog templated from the DialogBlocks datafile.
+    
+    clientgui/
+        BOINCGUI.cst
+        BOINCGUI.pjd
+        MainFrame.cpp
+    lib/
+        gui_rpc_client.h
+        gui_rpc_client_ops.C

clientgui/MainFrame.cpp

@@ -955,15 +955,20 @@ void CMainFrame::OnProjectsAttachToAccountManager(wxCommandEvent& WXUNUSED(event
     int                       iAnswer = 0;
     wxString                  strTitle = wxEmptyString;
     CMainDocument*            pDoc = wxGetApp().GetDocument();
-    CDlgAccountManagerStatus* pDlgStatus = new CDlgAccountManagerStatus(this);
 
     wxASSERT(pDoc);
     wxASSERT(wxDynamicCast(pDoc, CMainDocument));
-    wxASSERT(pDlgStatus);
+
+    m_pRefreshStateTimer->Stop();
+    m_pFrameRenderTimer->Stop();
+    m_pFrameListPanelRenderTimer->Stop();
+    m_pDocumentPollTimer->Stop();
 
     ACCT_MGR_INFO ami;
     pDoc->rpc.acct_mgr_info(ami);
     if (ami.acct_mgr_url.size()) {
+        CDlgAccountManagerStatus* pDlgStatus = new CDlgAccountManagerStatus(this);
+
         strTitle = pDlgStatus->GetTitle();
         strTitle += wxT(" - ") + wxString(ami.acct_mgr_name.c_str());
         pDlgStatus->SetAcctManagerName(ami.acct_mgr_name.c_str());
@@ -971,44 +976,33 @@ void CMainFrame::OnProjectsAttachToAccountManager(wxCommandEvent& WXUNUSED(event
         pDlgStatus->SetTitle(strTitle);
 
         iAnswer = pDlgStatus->ShowModal();
-    }
 
-    if (ami.login_name.empty() && (ID_CHANGE != iAnswer)) {
-        iAnswer = ID_CHANGE;
+        if (pDlgStatus)
+            pDlgStatus->Destroy();
     }
 
     if ((ID_UPDATE == iAnswer) || (ID_CHANGE == iAnswer)) {
-        m_pRefreshStateTimer->Stop();
-        m_pFrameRenderTimer->Stop();
-        m_pFrameListPanelRenderTimer->Stop();
-        m_pDocumentPollTimer->Stop();
-
         CWizardAccountManager* pWizard = new CWizardAccountManager(this);
 
         wxString strURL = wxEmptyString;
         bool bCredentialsCached = false;
         if (ID_UPDATE == iAnswer) {
             strURL = ami.acct_mgr_url.c_str();
-            bCredentialsCached = ami.login_name.length() && ami.password.length();
-            pWizard->Run( strURL, bCredentialsCached );
-        } else {
-            pWizard->Run( strURL, bCredentialsCached );
+            bCredentialsCached = ami.have_credentials;
         }
+        pWizard->Run( strURL, bCredentialsCached );
 
         if (pWizard)
             pWizard->Destroy();
 
+        FireRefreshView();
+    }
+
     m_pRefreshStateTimer->Start();
     m_pFrameRenderTimer->Start();
     m_pFrameListPanelRenderTimer->Start();
     m_pDocumentPollTimer->Start();
 
-        FireRefreshView();
-    }
-
-    if (pDlgStatus)
-        pDlgStatus->Destroy();
-
     wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnProjectsAttachToAccountManager - Function End"));
 }
 

lib/gui_rpc_client.h

@@ -396,10 +396,6 @@ struct ACCT_MGR_INFO {
     std::string acct_mgr_url;
     bool have_credentials;
     
-    // the following are not filled in by acct_mgr_info RPC
-    std::string login_name;
-    std::string password;
-
     ACCT_MGR_INFO();
     ~ACCT_MGR_INFO();
 

lib/gui_rpc_client_ops.C

@@ -787,8 +787,6 @@ int ACCT_MGR_INFO::parse(MIOFILE& in) {
 void ACCT_MGR_INFO::clear() {
     acct_mgr_name = "";
     acct_mgr_url = "";
-    login_name = "";
-    password = "";
     have_credentials = false;
 }