From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Fri, 21 Feb 2014 19:49:30 +0000 (+0000)
Subject: Don't show error message when we are just canceling a job to reprocess it.
X-Git-Tag: v2.2b1~733
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7dc514dc6ae27497bfcd82e152dd084b86b3815;p=thirdparty%2Fcups.git

Don't show error message when we are just canceling a job to reprocess it.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11637 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 047803ccc2..ec9fd105cd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 2.0b1 - 2014-02-13
+CHANGES.txt - 2.0b1 - 2014-02-20
 --------------------------------
 
 CHANGES IN CUPS V2.0b1
@@ -9,6 +9,8 @@ CHANGES IN CUPS V2.0b1
 	  of the CUPS 1.4 sleep support to do a cleaner sleep
 	  (<rdar://problem/14323704>)
 	- Dropped support for AIX, HP-UX, and OSF/1 (aka Digital UNIX)
+	- Added support for re-sending a job as a raster file if a higher-level
+	  format such as PDF fails (<rdar://problem/15583721>)
 	- Added support for regular expression matching in the MIME type rules
 	  (<rdar://problem/11131245>)
 	- cupsRasterInterpretPPD now supports the Orientation header in order to
diff --git a/backend/ipp.c b/backend/ipp.c
index 7c10819f3a..512490fda0 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -2028,8 +2028,13 @@ main(int  argc,				/* I - Number of command-line args */
   */
 
   if (job_canceled > 0 && job_id > 0)
+  {
     cancel_job(http, uri, job_id, resource, argv[2], version);
 
+    if (cupsLastError() > IPP_OK_CONFLICT)
+      _cupsLangPrintFilter(stderr, "ERROR", _("Unable to cancel print job."));
+  }
+
  /*
   * Check the printer state and report it if necessary...
   */
@@ -2166,9 +2171,6 @@ cancel_job(http_t     *http,		/* I - HTTP connection */
   */
 
   ippDelete(cupsDoRequest(http, request, resource));
-
-  if (cupsLastError() > IPP_OK_CONFLICT)
-    _cupsLangPrintFilter(stderr, "ERROR", _("Unable to cancel print job."));
 }
 
 
@@ -2458,10 +2460,17 @@ monitor_printer(
   */
 
   if (job_canceled > 0 && monitor->job_id > 0)
+  {
     if (!httpReconnect(http))
+    {
       cancel_job(http, monitor->uri, monitor->job_id, monitor->resource,
                  monitor->user, monitor->version);
 
+      if (cupsLastError() > IPP_OK_CONFLICT)
+	_cupsLangPrintFilter(stderr, "ERROR", _("Unable to cancel print job."));
+    }
+  }
+
  /*
   * Cleanup and return...
   */