From 2ad0e83417f4da655bdde50a8610266155b3f5cc Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 26 Jun 2013 16:16:21 -0700
Subject: [PATCH 1/4] web: don't show host cache size if we don't know it

---
 html/inc/host.inc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/html/inc/host.inc b/html/inc/host.inc
index 93045b5d23..44d4a68f6c 100644
--- a/html/inc/host.inc
+++ b/html/inc/host.inc
@@ -124,9 +124,11 @@ function show_host($host, $user, $ipprivate) {
     $x = $host->m_nbytes/(1024*1024);
     $y = round($x, 2);
     row2(tra("Memory"), tra("%1 MB", $y));
-    $x = $host->m_cache/1024;
-    $y = round($x, 2);
-    row2(tra("Cache"), tra("%1 KB", $y));
+    if ($host->m_cache > 0) {
+        $x = $host->m_cache/1024;
+        $y = round($x, 2);
+        row2(tra("Cache"), tra("%1 KB", $y));
+    }
 
     if ($user) {
         $x = $host->m_swap/(1024*1024);

From 85245f18028a2f87ef81ef2590af9705c126b138 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 26 Jun 2013 16:23:50 -0700
Subject: [PATCH 2/4] web: show host product name to owner

---
 html/inc/host.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/html/inc/host.inc b/html/inc/host.inc
index 44d4a68f6c..064005d37f 100644
--- a/html/inc/host.inc
+++ b/html/inc/host.inc
@@ -117,6 +117,9 @@ function show_host($host, $user, $ipprivate) {
         row2(tra("Coprocessors"), gpu_desc($host->serialnum));
     }
     row2(tra("Operating System"), "$host->os_name <br> $host->os_version");
+    if ($user && $host->product_name) {
+        row2(tra("Product name"), $host->product_name);
+    }
     $v = boinc_version($host->serialnum);
     if ($v) {
         row2(tra("BOINC version"), $v);

From 9ad9c5ee132f061e4d6bd9f2f60ee11befeb128c Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 26 Jun 2013 16:33:32 -0700
Subject: [PATCH 3/4] client (Android): show "GUI not active" suspend reason

---
 lib/str_util.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/str_util.cpp b/lib/str_util.cpp
index fe951a89fc..475cfc8999 100644
--- a/lib/str_util.cpp
+++ b/lib/str_util.cpp
@@ -575,6 +575,7 @@ const char* suspend_reason_string(int reason) {
     case SUSPEND_REASON_WIFI_STATE: return "not connected to WiFi network";
     case SUSPEND_REASON_BATTERY_CHARGING: return "battery low";
     case SUSPEND_REASON_BATTERY_OVERHEATED: return "battery thermal protection";
+    case SUSPEND_REASON_NO_GUI_KEEPALIVE: return "GUI not active";
     }
     return "unknown reason";
 }

From 36148709523a7e9dbc89689b60bd6843d62f8963 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 26 Jun 2013 20:36:44 -0700
Subject: [PATCH 4/4] client: don't request work from NCI project if "no new
 work" set

---
 client/work_fetch.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp
index e6b3a7500c..a94779ff7c 100644
--- a/client/work_fetch.cpp
+++ b/client/work_fetch.cpp
@@ -474,7 +474,7 @@ void WORK_FETCH::piggyback_work_request(PROJECT* p) {
     clear_request();
     if (config.fetch_minimal_work && gstate.had_or_requested_work) return;
     if (p->non_cpu_intensive) {
-        if (!has_a_job_in_progress(p)) {
+        if (!has_a_job_in_progress(p) && !p->dont_request_more_work) {
             rsc_work_fetch[0].req_secs = 1;
         }
         return;