diff --git a/checkin_notes b/checkin_notes index cb77d95da9..6f52f601bd 100644 --- a/checkin_notes +++ b/checkin_notes @@ -5638,3 +5638,15 @@ Rom 13 June 2009 AccountManagerPropertiesPage.cpp ProjectProcessingPage.cpp ProjectPropertiesPage.cpp + +Charlie 14 June 2009 + - MGR: When automatically running Synchronize AM Wizard ar Manager launch, + hide the main window only if it was not previously shown. + - Mac Installer: check in a copy of GR / PTP signing key with UNIX / Mac + line endings. + + clientgui/ + AdvancedFrame.cpp + mac_installer/ + Progress/ + acct_mgr_url.xml (added) \ No newline at end of file diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp index 6ab1503ea5..3f911a4281 100644 --- a/clientgui/AdvancedFrame.cpp +++ b/clientgui/AdvancedFrame.cpp @@ -1527,6 +1527,7 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) { wxWindow* pwndNotebookPage = NULL; CBOINCBaseView* pView = NULL; int iItemCount = 0, iIndex; + int wasShown = 0; wxASSERT(m_pNotebook); wxASSERT(pDoc); @@ -1577,7 +1578,9 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) { pDoc->rpc.get_project_init_status(pis); pDoc->rpc.acct_mgr_info(ami); if (ami.acct_mgr_url.size() && !ami.have_credentials) { - if (!IsShown()) { + if (IsShown()) { + wasShown = 1; + } else { Show(); } @@ -1585,8 +1588,10 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) { if (pAPWizard->SyncToAccountManager()) { #if defined(__WXMSW__) || defined(__WXMAC__) - // If successful, hide the main window - Hide(); + // If successful, hide the main window if we showed it + if (!wasShown) { + Hide(); + } #endif // %s is the application name diff --git a/mac_installer/Progress/acct_mgr_url.xml b/mac_installer/Progress/acct_mgr_url.xml new file mode 100644 index 0000000000..2159a729de --- /dev/null +++ b/mac_installer/Progress/acct_mgr_url.xml @@ -0,0 +1,16 @@ + + GridRepublic + http://www.gridrepublic.org/ + +1024 +9c3af22a230f1eb122b8eab256e5e46b49f6d357e65d00e414cf6af105aef217 +1de0793353097bbbb918413f79cb5bfaa4532daf061ece07b63f209690a3e1b1 +8906a9ae4f521ec25e6fb79b8679dd4c18c0f022dcb95baefeca091d572c7738 +e1b1d542bbec94552e0e37c698427f4538b947b79072d112ebcf4d9c509b16d9 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000010001 +. + +