Merge changes from CUPS trunk, r6739.

[thirdparty/cups.git] / cups / mark.c

diff --git a/cups/mark.c b/cups/mark.c
index 92d2faee21eb4fb71bca95ae5cb12338f9e62e18..83298a226a211734c8033fd0df86b592c69d480c 100644 (file)
--- a/cups/mark.c
+++ b/cups/mark.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: mark.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: mark.c 6703 2007-07-20 21:28:10Z mike $"
  *
  *   Option marking routines for the Common UNIX Printing System (CUPS).
  *
@@ -73,6 +73,8 @@ ppdConflicts(ppd_file_t *ppd)         /* I - PPD to check */
   for (o1 = ppdFirstOption(ppd); o1; o1 = ppdNextOption(ppd))
     o1->conflicted = 0;
 
+  cupsArraySave(ppd->marked);
+
  /*
   * Loop through all of the UI constraints and flag any options
   * that conflict...
@@ -173,6 +175,8 @@ ppdConflicts(ppd_file_t *ppd)               /* I - PPD to check */
     }
   }
 
+  cupsArrayRestore(ppd->marked);
+
  /*
   * Return the number of conflicts found...
   */
@@ -617,8 +621,7 @@ ppdMarkOption(ppd_file_t *ppd,              /* I - PPD file record */
     else if (!strcasecmp(option, "InputSlot"))
     {
      /*
-      * Unmark ManualFeed True and possibly mark ManualFeed False
-      * option...
+      * Unmark ManualFeed option...
       */
 
       if ((o = ppdFindOption(ppd, "ManualFeed")) != NULL)
@@ -721,5 +724,5 @@ ppd_defaults(ppd_file_t  *ppd,      /* I - PPD file */
 
 
 /*
- * End of "$Id: mark.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: mark.c 6703 2007-07-20 21:28:10Z mike $".
  */