diff options
| author | Michael R Sweet <michaelrsweet@gmail.com> | 2016-07-19 15:27:11 -0400 |
|---|---|---|
| committer | Michael R Sweet <michaelrsweet@gmail.com> | 2016-07-19 15:27:11 -0400 |
| commit | 837dc15e51171be02f3f305a6f1524b55b5ada93 (patch) | |
| tree | 5a32b49b433ed92dacf6203d6bdfc471b4658e25 | |
| parent | bfbcda7ec1539cf5cdf6aa9763649963040ef329 (diff) | |
Clear informational messages out of printer-state-message when a job completes
(Issue #4851)
| -rw-r--r-- | scheduler/job.c | 7 | ||||
| -rw-r--r-- | xcode/CUPS.xcodeproj/project.pbxproj | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/scheduler/job.c b/scheduler/job.c index e6434d974..0f1d648d5 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -3545,6 +3545,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 93dd19ac6..5c31c7ac9 100644 --- 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; |