From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Mon, 6 Jan 2014 22:05:26 +0000 (+0000)
Subject: lpq and lpstat did not list jobs in the correct order when priorities were specified... 
X-Git-Tag: v2.2b1~782
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e584c0683db65b3af344638f148b3fe8e5b49336;p=thirdparty%2Fcups.git

lpq and lpstat did not list jobs in the correct order when priorities were specified (STR #4326)

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 a207788ae..a6a1ac92d 100644
--- 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 5f53193b6..8bf7498fe 100644
--- 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"))
   {