From 81ca21c8280327630f0d566be2ecb11129377b0c Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 2 Mar 2011 18:53:18 +0000
Subject: [PATCH] 	- manager: show notice create time rather than arrival
 time 	- client: don't show "need network" notice if we don't need it

svn path=/trunk/boinc/; revision=23133
---
 checkin_notes                | 9 +++++++++
 client/cs_notice.cpp         | 4 +++-
 clientgui/NoticeListCtrl.cpp | 8 ++++----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index e81b4da623..f7f3c60e7c 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1241,3 +1241,12 @@ Rom    2 Mar 2011
 
     clientgui/
         NoticeListCtrl.cpp, .h
+
+David  2 Mar 2011
+	- manager: show notice create time rather than arrival time
+	- client: don't show "need network" notice if we don't need it
+
+	clientgui/
+		NoticeListCtrl.cpp
+	client/
+		cs_notice.cpp
diff --git a/client/cs_notice.cpp b/client/cs_notice.cpp
index b77a1e6ff9..984d750c45 100644
--- a/client/cs_notice.cpp
+++ b/client/cs_notice.cpp
@@ -484,7 +484,9 @@ void NOTICES::write(int seqno, GUI_RPC_CONN& grpc, MIOFILE& fout, bool public_on
     unsigned int i;
     MIOFILE mf;
 
-    if (net_status.network_status() != NETWORK_STATUS_WANT_CONNECTION) {
+    switch (net_status.network_status()) {
+    case NETWORK_STATUS_ONLINE:
+    case NETWORK_STATUS_WANT_DISCONNECT:
         remove_network_msg();
     }
     if (log_flags.notice_debug) {
diff --git a/clientgui/NoticeListCtrl.cpp b/clientgui/NoticeListCtrl.cpp
index e38b7fd28d..710e1fb344 100644
--- a/clientgui/NoticeListCtrl.cpp
+++ b/clientgui/NoticeListCtrl.cpp
@@ -466,7 +466,7 @@ wxString CNoticeListCtrl::OnGetItem(size_t i) const {
     wxString strDescription = wxEmptyString;
     wxString strProjectName = wxEmptyString;
     wxString strURL = wxEmptyString;
-    wxString strArrivalTime = wxEmptyString;
+    wxString create_time = wxEmptyString;
     wxString strBuffer = wxEmptyString;
     wxString strTemp = wxEmptyString;
     wxDateTime dtBuffer;
@@ -506,8 +506,8 @@ wxString CNoticeListCtrl::OnGetItem(size_t i) const {
         strDescription = wxString(np->description.c_str(), wxConvUTF8);
         pDoc->LocalizeNoticeText(strDescription, true);
 
-        dtBuffer.Set((time_t)np->arrival_time);
-        strArrivalTime = dtBuffer.Format();
+        dtBuffer.Set((time_t)np->create_time);
+        create_time = dtBuffer.Format();
 
         strBuffer = wxT("<table border=0 cellpadding=5><tr><td>");
 
@@ -523,7 +523,7 @@ wxString CNoticeListCtrl::OnGetItem(size_t i) const {
 
         strBuffer += wxT("<br><font size=-2 color=#8f8f8f>");
 
-        strBuffer += strArrivalTime;
+        strBuffer += create_time;
 
         if (!strURL.IsEmpty()) {
             strTemp.Printf(