Clear informational messages out of printer-state-message when a job completes

(Issue #4851)

diff --git a/scheduler/job.c b/scheduler/job.c
index e6434d974af85008b9611ce2e4342ca926368677..0f1d648d569ef3e6d284589c912e74384c2b94b2 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -3544,6 +3544,13 @@ finalize_job(cupsd_job_t *job,           /* I - Job */
 
   cupsArrayRemove(PrintingJobs, job);
 
+ /*
+  * Clear informational messages...
+  */
+
+  if (job->status_level > CUPSD_LOG_ERROR)
+    job->printer->state_message[0] = '\0';
+
  /*
   * Apply any PPD updates...
   */

diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj
index 93dd19ac6fadf51976443a5d3a9ea0901439c742..5c31c7ac9ae2c56cc9826a56c9aba2b00363da04 100644 (file)
--- a/xcode/CUPS.xcodeproj/project.pbxproj
+++ b/xcode/CUPS.xcodeproj/project.pbxproj
@@ -7157,7 +7157,7 @@
                72BF96371333042100B1EAD7 /* Project object */ = {
                        isa = PBXProject;
                        attributes = {
-                               LastUpgradeCheck = 0730;
+                               LastUpgradeCheck = 0800;
                                ORGANIZATIONNAME = "Apple Inc.";
                                TargetAttributes = {
                                        270695FD1CADF3E200FFE5FB = {
@@ -10942,6 +10942,7 @@
                72BF963C1333042100B1EAD7 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               ASSETCATALOG_COMPRESSION = lossless;
                                CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
@@ -10976,6 +10977,7 @@
                72BF963D1333042100B1EAD7 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               ASSETCATALOG_COMPRESSION = "respect-asset-catalog";
                                CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;