diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-09-13 23:49:19 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-09-13 23:49:19 +0000 |
| commit | a906a73123e39495319f989905be18ed368385f7 (patch) | |
| tree | bd3abb70a718123a4bae0cabb73078071ababc15 /cups/attr.c | |
| parent | f495e905dd39afc788246388a88077abd2767d86 (diff) | |
| download | cups-a906a73123e39495319f989905be18ed368385f7.tar.gz | |
Don't map Primera name to Fargo anymore (STR #4708)
Bump version to 2.1.1.
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12867 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/attr.c')
| -rw-r--r-- | cups/attr.c | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/cups/attr.c b/cups/attr.c index bc241a517..c98a36b47 100644 --- a/cups/attr.c +++ b/cups/attr.c @@ -1,22 +1,16 @@ /* * "$Id$" * - * PPD model-specific attribute routines for CUPS. + * PPD model-specific attribute routines for CUPS. * - * Copyright 2007-2012 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. + * Copyright 2007-2015 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * ppdFindAttr() - Find the first matching attribute. - * ppdFindNextAttr() - Find the next matching attribute. - * _ppdNormalizeMakeAndModel() - Normalize a product/make-and-model string. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -229,14 +223,6 @@ _ppdNormalizeMakeAndModel( snprintf(buffer, bufsize, "Canon %s", make_and_model); } - else if (!_cups_strncasecmp(make_and_model, "primera", 7)) - { - /* - * Fargo... - */ - - snprintf(buffer, bufsize, "Fargo %s", make_and_model); - } else if (!_cups_strncasecmp(make_and_model, "designjet", 9) || !_cups_strncasecmp(make_and_model, "deskjet", 7)) { |