From a65517bf60d596b676177e5687e4908d7853b5d0 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 20 Jul 2010 21:15:15 +0000
Subject: [PATCH] - client: don't archive system notices,     so they don't
 persist across client restarts.     These notices are for transient
 conditions.     If the user has fixed the condition,     there's no reason to
 keep showing the notice.     If they haven't fixed it, the notice will be
 regenerated soon. - manager: fix spelling error in simple GUI.

svn path=/trunk/boinc/; revision=22015
---
 checkin_notes                 | 16 ++++++++++++++++
 client/cs_notice.cpp          |  4 ++++
 client/gui_rpc_server_ops.cpp |  2 +-
 clientgui/MainDocument.cpp    |  2 ++
 clientgui/sg_ImageButton.cpp  |  2 +-
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 6691f1d03b..cd6fa72be8 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5290,3 +5290,19 @@ Charlie 19 Jul 2010
 
 	lib/
 		parse.cpp
+
+David  20 Jul 2010
+    - client: don't archive system notices,
+        so they don't persist across client restarts.
+        These notices are for transient conditions.
+        If the user has fixed the condition,
+        there's no reason to keep showing the notice.
+        If they haven't fixed it, the notice will be regenerated soon.
+    - manager: fix spelling error in simple GUI.
+
+    clientgui/
+        MainDocument.cpp
+        sg_ImageButton.cpp
+    client/
+        gui_rpc_server_ops.cpp
+        cs_notice.cpp
diff --git a/client/cs_notice.cpp b/client/cs_notice.cpp
index d2f25a3e34..f13bdfd487 100644
--- a/client/cs_notice.cpp
+++ b/client/cs_notice.cpp
@@ -236,11 +236,13 @@ int NOTICE::parse_rss(XML_PARSER& xp) {
 // called at the start of client initialization
 //
 void NOTICES::init() {
+#if 0
     read_archive_file(NOTICES_DIR"/archive.xml", NULL);
     if (log_flags.notice_debug) {
         msg_printf(0, MSG_INFO, "read %d BOINC notices", (int)notices.size());
     }
     write_archive(NULL);
+#endif
 }
 
 // called at the end of client initialization
@@ -319,9 +321,11 @@ bool NOTICES::append(NOTICE& n) {
         );
     }
     notices.push_front(n);
+#if 0
     if (!strlen(n.feed_url)) {
         write_archive(NULL);
     }
+#endif
     return true;
 }
 
diff --git a/client/gui_rpc_server_ops.cpp b/client/gui_rpc_server_ops.cpp
index 254ba9b99b..890ecf3c71 100644
--- a/client/gui_rpc_server_ops.cpp
+++ b/client/gui_rpc_server_ops.cpp
@@ -263,7 +263,7 @@ static void handle_project_op(char* buf, MIOFILE& fout, const char* op) {
         gstate.request_work_fetch("project resumed by user");
     } else if (!strcmp(op, "detach")) {
         if (p->attached_via_acct_mgr) {
-            msg_printf(p, MSG_USER_ALERT,
+            msg_printf(p, MSG_INFO,
                 "This project must be detached using the account manager web site."
             );
             fout.printf("<error>must detach using account manager</error>");
diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp
index 075cae962d..dec304f1ee 100644
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
@@ -2334,6 +2334,8 @@ wxString suspend_reason_wxstring(int reason) {
     case SUSPEND_REASON_TIME_OF_DAY: return _("time of day");
     case SUSPEND_REASON_BENCHMARKS: return _("CPU benchmarks in progress");
     case SUSPEND_REASON_DISK_SIZE: return _("need disk space - check preferences");
+    case SUSPEND_REASON_NO_RECENT_INPUT: return _("computer is not in use");
+    case SUSPEND_REASON_INITIAL_DELAY: return _("starting up");
     case SUSPEND_REASON_EXCLUSIVE_APP_RUNNING: return _("an exclusive app is running");
     case SUSPEND_REASON_CPU_USAGE: return _("CPU is busy");
     case SUSPEND_REASON_NETWORK_QUOTA_EXCEEDED: return _("network bandwidth limit exceeded");
diff --git a/clientgui/sg_ImageButton.cpp b/clientgui/sg_ImageButton.cpp
index 4f99c3af6c..fb9fb66344 100644
--- a/clientgui/sg_ImageButton.cpp
+++ b/clientgui/sg_ImageButton.cpp
@@ -89,7 +89,7 @@ wxString CImageButton::GetStatusText() {
 	} else if ( status == TAB_STATUS_PREEMPTED )  {
 		return wxString(_("Paused: Other work running"));
 	} else if ( status == TAB_STATUS_PAUSED_USER_REQ )  {
-		return wxString(_("Paused: User initiatied.  Click 'Resume' to continue"));
+		return wxString(_("Paused: User initiated.  Click 'Resume' to continue"));
 	} else if ( status == TAB_STATUS_PAUSED_USER_ACTIVE )  {
 		return wxString(_("Paused: User active"));
 	} else if ( status == TAB_STATUS_PAUSED_POWER )  {