Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3486 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index b7377edbfe974527add0c8da9387ee22c63c1e83..765dcedb831cd5493b2b0e96e00c0c3d3454e8d9 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,8 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.19
 
+       - If a backend failed for a printer, CUPS would
+         incorrectly requeue the job for printing again.
        - Added support for IPP collections and files.
        - Added experimental support for generic CGI scripts and
          programs, Java, Perl, PHP, and Python to the

diff --git a/scheduler/job.c b/scheduler/job.c
index 6ed1ae2604efeb7ae394a734bde4cea2b66645bf..148c3f51678f9982c4fc16d7336353226e871196 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.c,v 1.124.2.54 2003/03/14 21:43:33 mike Exp $"
+ * "$Id: job.c,v 1.124.2.55 2003/03/17 14:17:31 mike Exp $"
  *
  *   Job management routines for the Common UNIX Printing System (CUPS).
  *
@@ -1990,7 +1990,7 @@ StopJob(int id,                   /* I - Job ID */
         FilterLevel -= current->cost;
 
         if (current->status < 0 &&
-           (current->dtype & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT)) != 0)
+           !(current->dtype & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT)))
          SetPrinterState(current->printer, IPP_PRINTER_STOPPED);
        else if (current->printer->state != IPP_PRINTER_STOPPED)
          SetPrinterState(current->printer, IPP_PRINTER_IDLE);
@@ -2623,5 +2623,5 @@ start_process(const char *command,        /* I - Full path to command */
 
 
 /*
- * End of "$Id: job.c,v 1.124.2.54 2003/03/14 21:43:33 mike Exp $".
+ * End of "$Id: job.c,v 1.124.2.55 2003/03/17 14:17:31 mike Exp $".
  */