diff --git a/checkin_notes b/checkin_notes
index bb1b25fea9..e04100cc61 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -7740,3 +7740,9 @@ Charlie 18 Dec 2012
clientgui/
BOINCHtmlLBox.cpp,.h
BOINCInternetFSHandler.cpp
+
+Charlie 18 Dec 2012
+ - Mgr: Fix bad line endings.
+
+ clientgui/
+ ViewNotices.cpp,.h
diff --git a/clientgui/ViewNotices.cpp b/clientgui/ViewNotices.cpp
index 51b29237b8..87951b2732 100644
--- a/clientgui/ViewNotices.cpp
+++ b/clientgui/ViewNotices.cpp
@@ -1,148 +1,148 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
-//
-// BOINC is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// BOINC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with BOINC. If not, see .
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma implementation "ViewNotices.h"
-#endif
-
-#include "stdwx.h"
-#include "BOINCGUIApp.h"
-#include "BOINCBaseFrame.h"
-#include "MainDocument.h"
-#include "AdvancedFrame.h"
-#include "BOINCTaskCtrl.h"
-#include "ViewNotices.h"
-#include "NoticeListCtrl.h"
-#include "Events.h"
-#include "error_numbers.h"
-
-
-#include "res/mess.xpm"
-
-
-IMPLEMENT_DYNAMIC_CLASS(CViewNotices, CBOINCBaseView)
-
-BEGIN_EVENT_TABLE (CViewNotices, CBOINCBaseView)
- EVT_NOTICELIST_ITEM_DISPLAY(CViewNotices::OnLinkClicked)
-END_EVENT_TABLE ()
-
-
-CViewNotices::CViewNotices()
-{}
-
-
-CViewNotices::CViewNotices(wxNotebook* pNotebook) :
- CBOINCBaseView(pNotebook)
-{
- //
- // Setup View
- //
- wxFlexGridSizer* itemFlexGridSizer = new wxFlexGridSizer(1, 1, 0);
- wxASSERT(itemFlexGridSizer);
-
- itemFlexGridSizer->AddGrowableRow(0);
- itemFlexGridSizer->AddGrowableCol(0);
-
- m_pHtmlListPane = new CNoticeListCtrl(this);
- wxASSERT(m_pHtmlListPane);
-
- itemFlexGridSizer->Add(m_pHtmlListPane, 1, wxGROW|wxALL, 1);
-
- SetSizer(itemFlexGridSizer);
-}
-
-
-CViewNotices::~CViewNotices() {
-}
-
-
-wxString& CViewNotices::GetViewName() {
- static wxString strViewName(wxT("Notices"));
- return strViewName;
-}
-
-
-wxString& CViewNotices::GetViewDisplayName() {
- static wxString strViewName(_("Notices"));
- return strViewName;
-}
-
-
-const char** CViewNotices::GetViewIcon() {
- return mess_xpm;
-}
-
-
-const int CViewNotices::GetViewRefreshRate() {
- return 10;
-}
-
-const int CViewNotices::GetViewCurrentViewPage() {
- return VW_NOTIF;
-}
-
-
-bool CViewNotices::OnSaveState(wxConfigBase* WXUNUSED(pConfig)) {
- return true;
-}
-
-
-bool CViewNotices::OnRestoreState(wxConfigBase* WXUNUSED(pConfig)) {
- return true;
-}
-
-
-void CViewNotices::OnListRender(wxTimerEvent& WXUNUSED(event)) {
- wxLogTrace(wxT("Function Start/End"), wxT("CViewNotices::OnListRender - Function Begin"));
-
- static bool s_bInProgress = false;
- static wxString strLastMachineName = wxEmptyString;
- wxString strNewMachineName = wxEmptyString;
- CMainDocument* pDoc = wxGetApp().GetDocument();
-
- wxASSERT(pDoc);
- wxASSERT(m_pHtmlListPane);
- wxASSERT(wxDynamicCast(pDoc, CMainDocument));
-
- if (s_bInProgress) return;
- s_bInProgress = true;
-
- if (pDoc->IsConnected()) {
- pDoc->GetConnectedComputerName(strNewMachineName);
- if (strLastMachineName != strNewMachineName) {
- strLastMachineName = strNewMachineName;
- m_pHtmlListPane->Clear();
- }
- }
-
- // Don't call Freeze() / Thaw() here because it causes an unnecessary redraw
- m_pHtmlListPane->UpdateUI();
-
- pDoc->UpdateUnreadNoticeState();
-
- s_bInProgress = false;
-
- wxLogTrace(wxT("Function Start/End"), wxT("CViewNotices::OnListRender - Function End"));
-}
-
-
-void CViewNotices::OnLinkClicked( NoticeListCtrlEvent& event ) {
- if (event.GetURL().StartsWith(wxT("http://"))) {
- wxLaunchDefaultBrowser(event.GetURL());
- }
-}
-
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2008 University of California
+//
+// BOINC is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License
+// as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
+//
+// BOINC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with BOINC. If not, see .
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma implementation "ViewNotices.h"
+#endif
+
+#include "stdwx.h"
+#include "BOINCGUIApp.h"
+#include "BOINCBaseFrame.h"
+#include "MainDocument.h"
+#include "AdvancedFrame.h"
+#include "BOINCTaskCtrl.h"
+#include "ViewNotices.h"
+#include "NoticeListCtrl.h"
+#include "Events.h"
+#include "error_numbers.h"
+
+
+#include "res/mess.xpm"
+
+
+IMPLEMENT_DYNAMIC_CLASS(CViewNotices, CBOINCBaseView)
+
+BEGIN_EVENT_TABLE (CViewNotices, CBOINCBaseView)
+ EVT_NOTICELIST_ITEM_DISPLAY(CViewNotices::OnLinkClicked)
+END_EVENT_TABLE ()
+
+
+CViewNotices::CViewNotices()
+{}
+
+
+CViewNotices::CViewNotices(wxNotebook* pNotebook) :
+ CBOINCBaseView(pNotebook)
+{
+ //
+ // Setup View
+ //
+ wxFlexGridSizer* itemFlexGridSizer = new wxFlexGridSizer(1, 1, 0);
+ wxASSERT(itemFlexGridSizer);
+
+ itemFlexGridSizer->AddGrowableRow(0);
+ itemFlexGridSizer->AddGrowableCol(0);
+
+ m_pHtmlListPane = new CNoticeListCtrl(this);
+ wxASSERT(m_pHtmlListPane);
+
+ itemFlexGridSizer->Add(m_pHtmlListPane, 1, wxGROW|wxALL, 1);
+
+ SetSizer(itemFlexGridSizer);
+}
+
+
+CViewNotices::~CViewNotices() {
+}
+
+
+wxString& CViewNotices::GetViewName() {
+ static wxString strViewName(wxT("Notices"));
+ return strViewName;
+}
+
+
+wxString& CViewNotices::GetViewDisplayName() {
+ static wxString strViewName(_("Notices"));
+ return strViewName;
+}
+
+
+const char** CViewNotices::GetViewIcon() {
+ return mess_xpm;
+}
+
+
+const int CViewNotices::GetViewRefreshRate() {
+ return 10;
+}
+
+const int CViewNotices::GetViewCurrentViewPage() {
+ return VW_NOTIF;
+}
+
+
+bool CViewNotices::OnSaveState(wxConfigBase* WXUNUSED(pConfig)) {
+ return true;
+}
+
+
+bool CViewNotices::OnRestoreState(wxConfigBase* WXUNUSED(pConfig)) {
+ return true;
+}
+
+
+void CViewNotices::OnListRender(wxTimerEvent& WXUNUSED(event)) {
+ wxLogTrace(wxT("Function Start/End"), wxT("CViewNotices::OnListRender - Function Begin"));
+
+ static bool s_bInProgress = false;
+ static wxString strLastMachineName = wxEmptyString;
+ wxString strNewMachineName = wxEmptyString;
+ CMainDocument* pDoc = wxGetApp().GetDocument();
+
+ wxASSERT(pDoc);
+ wxASSERT(m_pHtmlListPane);
+ wxASSERT(wxDynamicCast(pDoc, CMainDocument));
+
+ if (s_bInProgress) return;
+ s_bInProgress = true;
+
+ if (pDoc->IsConnected()) {
+ pDoc->GetConnectedComputerName(strNewMachineName);
+ if (strLastMachineName != strNewMachineName) {
+ strLastMachineName = strNewMachineName;
+ m_pHtmlListPane->Clear();
+ }
+ }
+
+ // Don't call Freeze() / Thaw() here because it causes an unnecessary redraw
+ m_pHtmlListPane->UpdateUI();
+
+ pDoc->UpdateUnreadNoticeState();
+
+ s_bInProgress = false;
+
+ wxLogTrace(wxT("Function Start/End"), wxT("CViewNotices::OnListRender - Function End"));
+}
+
+
+void CViewNotices::OnLinkClicked( NoticeListCtrlEvent& event ) {
+ if (event.GetURL().StartsWith(wxT("http://"))) {
+ wxLaunchDefaultBrowser(event.GetURL());
+ }
+}
+
diff --git a/clientgui/ViewNotices.h b/clientgui/ViewNotices.h
index 0cd9f777b2..3da2ea19e9 100644
--- a/clientgui/ViewNotices.h
+++ b/clientgui/ViewNotices.h
@@ -1,62 +1,62 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
-//
-// BOINC is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// BOINC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with BOINC. If not, see .
-
-#ifndef _VIEWNOTIFICATIONS_H_
-#define _VIEWNOTIFICATIONS_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "ViewNotices.cpp"
-#endif
-
-
-#include "BOINCBaseView.h"
-
-
-class CNoticeListCtrl;
-class NoticeListCtrlEvent;
-
-
-class CViewNotices : public CBOINCBaseView {
- DECLARE_DYNAMIC_CLASS( CViewNotices )
-
-public:
- CViewNotices();
- CViewNotices(wxNotebook* pNotebook);
-
- ~CViewNotices();
-
- virtual wxString& GetViewName();
- virtual wxString& GetViewDisplayName();
- virtual const char** GetViewIcon();
- virtual const int GetViewRefreshRate();
- virtual const int GetViewCurrentViewPage();
-
-protected:
- CNoticeListCtrl* m_pHtmlListPane;
-
- virtual bool OnSaveState( wxConfigBase* pConfig );
- virtual bool OnRestoreState( wxConfigBase* pConfig );
-
- virtual void OnListRender( wxTimerEvent& event );
- void OnLinkClicked( NoticeListCtrlEvent& event );
-
- DECLARE_EVENT_TABLE()
-};
-
-
-#endif
-
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2008 University of California
+//
+// BOINC is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License
+// as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
+//
+// BOINC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with BOINC. If not, see .
+
+#ifndef _VIEWNOTIFICATIONS_H_
+#define _VIEWNOTIFICATIONS_H_
+
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "ViewNotices.cpp"
+#endif
+
+
+#include "BOINCBaseView.h"
+
+
+class CNoticeListCtrl;
+class NoticeListCtrlEvent;
+
+
+class CViewNotices : public CBOINCBaseView {
+ DECLARE_DYNAMIC_CLASS( CViewNotices )
+
+public:
+ CViewNotices();
+ CViewNotices(wxNotebook* pNotebook);
+
+ ~CViewNotices();
+
+ virtual wxString& GetViewName();
+ virtual wxString& GetViewDisplayName();
+ virtual const char** GetViewIcon();
+ virtual const int GetViewRefreshRate();
+ virtual const int GetViewCurrentViewPage();
+
+protected:
+ CNoticeListCtrl* m_pHtmlListPane;
+
+ virtual bool OnSaveState( wxConfigBase* pConfig );
+ virtual bool OnRestoreState( wxConfigBase* pConfig );
+
+ virtual void OnListRender( wxTimerEvent& event );
+ void OnLinkClicked( NoticeListCtrlEvent& event );
+
+ DECLARE_EVENT_TABLE()
+};
+
+
+#endif
+