lpq and lpstat did not list jobs in the correct order when priorities were specified...

The default list should be ActiveJobs, not Jobs.

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

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index a207788ae932cc166024614f8062b06cc81256cf..a6a1ac92df24d38d98d53ba6c41f04a90629874a 100644 (file)
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -33,6 +33,8 @@ CHANGES IN CUPS V1.7.1
        - CUPS did not support "auto-monochrome" or "process-monochrome" for the
          "print-color-mode" option (<rdar://problem/15482520>)
        - Using "@IF(name)" in an Allow or Deny rule did not work (STR #4328)
+       - lpq and lpstat did not list jobs in the correct order when priorities
+         were specified (STR #4326)
 
 
 CHANGES IN CUPS V1.7.0

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 5f53193b6bd33a6b2b9c29265b470c0d596e7c1c..8bf7498fe131df34c268569a231df90db98e983f 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -3,7 +3,7 @@
  *
  * IPP routines for the CUPS scheduler.
  *
- * Copyright 2007-2013 by Apple Inc.
+ * Copyright 2007-2014 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  * This file contains Kerberos support code, copyright 2006 by
@@ -6209,7 +6209,7 @@ get_jobs(cupsd_client_t  *con,            /* I - Client connection */
   {
     job_comparison = -1;
     job_state      = IPP_JOB_STOPPED;
-    list           = Jobs;
+    list           = ActiveJobs;
   }
   else if (!strcmp(attr->values[0].string.text, "completed"))
   {