Skip to content

Commit 939368f

Browse files
committed
Fix document-unprintable-error support (Issue #391)
1 parent 2d5deb7 commit 939368f

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Changes in CUPS v2.4.8 (TBA)
1313
- Raised `cups_enum_dests()` timeout for listing available IPP printers
1414
(Issue #751)
1515
- Fixed mapping of PPD InputSlot, MediaType, and OutputBin values (Issue #238)
16+
- Fixed "document-unprintable-error" handling (Issue #391)
1617
- Fixed the web interface not showing an error for a non-existent printer
1718
(Issue #423)
1819
- Fixed printing of jobs with job name longer than 255 chars on older printers

backend/ipp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1919,7 +1919,7 @@ main(int argc, /* I - Number of command-line args */
19191919

19201920
if (ippContainsString(reasons, "document-format-error"))
19211921
ipp_status = IPP_STATUS_ERROR_DOCUMENT_FORMAT_ERROR;
1922-
else if (ippContainsString(reasons, "document-unprintable"))
1922+
else if (ippContainsString(reasons, "document-unprintable-error"))
19231923
ipp_status = IPP_STATUS_ERROR_DOCUMENT_UNPRINTABLE;
19241924

19251925
ippDelete(response);
@@ -2708,7 +2708,7 @@ monitor_printer(
27082708
new_reasons |= _CUPS_JSR_JOB_RELEASE_WAIT;
27092709
else if (!strcmp(attr->values[i].string.text, "document-format-error"))
27102710
new_reasons |= _CUPS_JSR_DOCUMENT_FORMAT_ERROR;
2711-
else if (!strcmp(attr->values[i].string.text, "document-unprintable"))
2711+
else if (!strcmp(attr->values[i].string.text, "document-unprintable-error"))
27122712
new_reasons |= _CUPS_JSR_DOCUMENT_UNPRINTABLE;
27132713

27142714
if (!job_canceled && (!strncmp(attr->values[i].string.text, "job-canceled-", 13) || !strcmp(attr->values[i].string.text, "aborted-by-system")))

0 commit comments

Comments
 (0)