From 93a5da07d57035c611898ebd7345887d5145d757 Mon Sep 17 00:00:00 2001 From: msweet Date: Wed, 19 Nov 2014 12:38:44 +0000 Subject: [PATCH] 13A598: spin in AddPrinter while adding printer from Printers & Scanners prefs Don't need to do ppdConflicts after every default is marked. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12258 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES.txt | 4 +++- cups/mark.c | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 68311d7a9..a24be423c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,7 @@ -CHANGES.txt - 2.1b1 - 2014-10-31 +CHANGES.txt - 2.1b1 - 2014-11-19 -------------------------------- CHANGES IN CUPS V2.1b1 + - Improved speed of ppdMarkDefaults for complex/large PPDs + () diff --git a/cups/mark.c b/cups/mark.c index 18d0ede55..8a02f4d90 100644 --- a/cups/mark.c +++ b/cups/mark.c @@ -514,6 +514,12 @@ ppdMarkDefaults(ppd_file_t *ppd) /* I - PPD file record */ for (i = ppd->num_groups, g = ppd->groups; i > 0; i --, g ++) ppd_defaults(ppd, g); + + /* + * Finally, tag any conflicts (API compatibility) once at the end. + */ + + ppdConflicts(ppd); } @@ -710,7 +716,7 @@ ppd_defaults(ppd_file_t *ppd, /* I - PPD file */ for (i = g->num_options, o = g->options; i > 0; i --, o ++) if (_cups_strcasecmp(o->keyword, "PageRegion") != 0) - ppdMarkOption(ppd, o->keyword, o->defchoice); + ppd_mark_option(ppd, o->keyword, o->defchoice); for (i = g->num_subgroups, sg = g->subgroups; i > 0; i --, sg ++) ppd_defaults(ppd, sg); -- 2.39.5