[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cups-commit
Subject:    [cups.commit] [CUPS] r8787 - in trunk: . cgi-bin
From:       cups-dev () easysw ! com
Date:       2009-08-28 22:37:07
Message-ID: 9558-cups.commit () news ! easysw ! com
[Download RAW message or body]

Author: mike
Date: 2009-08-28 15:37:07 -0700 (Fri, 28 Aug 2009)
New Revision: 8787
Log:
The "Query Printer for Default Options" page did not go away if the query job
was held (STR #3302)



Modified:
   trunk/CHANGES-1.4.txt
   trunk/cgi-bin/ipp-var.c

Modified: trunk/CHANGES-1.4.txt
===================================================================
--- trunk/CHANGES-1.4.txt	2009-08-28 22:32:54 UTC (rev 8786)
+++ trunk/CHANGES-1.4.txt	2009-08-28 22:37:07 UTC (rev 8787)
@@ -10,6 +10,8 @@
 	- The JobKillDelay was not triggered for canceled jobs (STR #3292)
 	- The PPD compiler could get in an infinite loop (STR #3293)
 	- The configure check for dns-sd.h was broken (STR #3297)
+	- The "Query Printer for Default Options" page did not go away if the
+	  query job was held (STR #3302)
 
 
 CHANGES IN CUPS V1.4.0

Modified: trunk/cgi-bin/ipp-var.c
===================================================================
--- trunk/cgi-bin/ipp-var.c	2009-08-28 22:32:54 UTC (rev 8786)
+++ trunk/cgi-bin/ipp-var.c	2009-08-28 22:37:07 UTC (rev 8787)
@@ -650,7 +650,8 @@
 	cgiSetIPPVars(response, NULL, NULL, NULL, 0);
 
       attr = ippFindAttribute(response, "job-state", IPP_TAG_ENUM);
-      if (!attr || attr->values[0].integer >= IPP_JOB_STOPPED)
+      if (!attr || attr->values[0].integer >= IPP_JOB_STOPPED ||
+          attr->values[0].integer == IPP_JOB_HELD)
       {
 	ippDelete(response);
 	break;

_______________________________________________
cups-commit mailing list
cups-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/cups-commit
[prev in list] [next in list] [prev in thread] [next in thread]