Fix document-unprintable-error support (Issue #391)

diff --git a/CHANGES.md b/CHANGES.md
index e69ee8ac18e6fa7a7396e65c43dd31bba5eb5432..a4222f6df5d6dfe4126176f80e8eac86848b4b91 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ Changes in CUPS v2.4.8 (TBA)
 - Raised `cups_enum_dests()` timeout for listing available IPP printers
   (Issue #751)
 - Fixed mapping of PPD InputSlot, MediaType, and OutputBin values (Issue #238)
+- Fixed "document-unprintable-error" handling (Issue #391)
 - Fixed the web interface not showing an error for a non-existent printer
   (Issue #423)
 - Fixed printing of jobs with job name longer than 255 chars on older printers

diff --git a/backend/ipp.c b/backend/ipp.c
index 2bbdefbd1f6a0b41bf118dae777fb0c1e1181030..8609e3a283459aece380a19d0fb55b597c62c767 100644 (file)
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1919,7 +1919,7 @@ main(int  argc,                           /* I - Number of command-line args */
 
           if (ippContainsString(reasons, "document-format-error"))
             ipp_status = IPP_STATUS_ERROR_DOCUMENT_FORMAT_ERROR;
-          else if (ippContainsString(reasons, "document-unprintable"))
+          else if (ippContainsString(reasons, "document-unprintable-error"))
             ipp_status = IPP_STATUS_ERROR_DOCUMENT_UNPRINTABLE;
 
          ippDelete(response);
@@ -2708,7 +2708,7 @@ monitor_printer(
             new_reasons |= _CUPS_JSR_JOB_RELEASE_WAIT;
           else if (!strcmp(attr->values[i].string.text, "document-format-error"))
             new_reasons |= _CUPS_JSR_DOCUMENT_FORMAT_ERROR;
-          else if (!strcmp(attr->values[i].string.text, "document-unprintable"))
+          else if (!strcmp(attr->values[i].string.text, "document-unprintable-error"))
             new_reasons |= _CUPS_JSR_DOCUMENT_UNPRINTABLE;
 
          if (!job_canceled && (!strncmp(attr->values[i].string.text, "job-canceled-", 13) || !strcmp(attr->values[i].string.text, "aborted-by-system")))