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

List:       cups-commit
Subject:    [cups.commit] [CUPS] r8795 - in trunk: . scheduler
From:       cups-dev () easysw ! com
Date:       2009-08-29 4:32:46
Message-ID: 9566-cups.commit () news ! easysw ! com
[Download RAW message or body]

Author: mike
Date: 2009-08-28 21:32:45 -0700 (Fri, 28 Aug 2009)
New Revision: 8795
Log:
The scheduler could return an empty supported document format (STR #3308)



Modified:
   trunk/CHANGES-1.4.txt
   trunk/scheduler/printers.c

Modified: trunk/CHANGES-1.4.txt
===================================================================
--- trunk/CHANGES-1.4.txt	2009-08-29 04:27:38 UTC (rev 8794)
+++ trunk/CHANGES-1.4.txt	2009-08-29 04:32:45 UTC (rev 8795)
@@ -21,6 +21,8 @@
 	- Modifying a class in the web interface did not work (STR #3312)
 	- BrowseLocalProtocols could be cleared when changing the sharing
 	  setting (STR #3287)
+	- The scheduler could return an empty supported document format
+	  (STR #3308)
 
 
 CHANGES IN CUPS V1.4.0

Modified: trunk/scheduler/printers.c
===================================================================
--- trunk/scheduler/printers.c	2009-08-29 04:27:38 UTC (rev 8794)
+++ trunk/scheduler/printers.c	2009-08-29 04:32:45 UTC (rev 8795)
@@ -3699,10 +3699,6 @@
                       p->name, mimetype);
   }
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                  "add_printer_formats: %s: %d supported types",
-		  p->name, cupsArrayCount(p->filetypes) + 1);
-
  /*
   * Add the file formats that can be filtered...
   */
@@ -3713,9 +3709,13 @@
   else
     i = 0;
 
+  cupsdLogMessage(CUPSD_LOG_DEBUG2,
+                  "add_printer_formats: %s: %d supported types",
+                  p->name, cupsArrayCount(p->filetypes) + i);
+
   attr = ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_MIMETYPE,
                        "document-format-supported",
-		       cupsArrayCount(p->filetypes) + 1, NULL, NULL);
+                       cupsArrayCount(p->filetypes) + i, NULL, NULL);
 
   if (i)
     attr->values[0].string.text = _cupsStrAlloc("application/octet-stream");

_______________________________________________
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]