Merge changes from 1.4svn-r7067.

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

diff --git a/cups/encode.c b/cups/encode.c
index 530800d5ef8537b3f59af536e3eeea4f61dc1ad2..4e7f78118548ba342a3ab0d5c096bf702c0661de 100644 (file)
--- a/cups/encode.c
+++ b/cups/encode.c
@@ -1,25 +1,16 @@
 /*
- * "$Id: encode.c 6267 2007-02-11 23:24:22Z mike $"
+ * "$Id: encode.c 6649 2007-07-11 21:46:42Z mike $"
  *
  *   Option encoding routines for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   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/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *
@@ -52,6 +43,8 @@
 
 static const _ipp_option_t ipp_options[] =
 {
+  { "auth-info",               IPP_TAG_TEXT,           IPP_TAG_JOB },
+  { "auth-info-required",      IPP_TAG_KEYWORD,        IPP_TAG_PRINTER },
   { "blackplot",               IPP_TAG_BOOLEAN,        IPP_TAG_JOB },
   { "blackplot-default",       IPP_TAG_BOOLEAN,        IPP_TAG_PRINTER },
   { "brightness",              IPP_TAG_INTEGER,        IPP_TAG_JOB },
@@ -88,7 +81,7 @@ static const _ipp_option_t ipp_options[] =
   { "notify-lease-duration-default", IPP_TAG_INTEGER,  IPP_TAG_PRINTER },
   { "notify-natural-language", IPP_TAG_LANGUAGE,       IPP_TAG_SUBSCRIPTION },
   { "notify-pull-method",      IPP_TAG_KEYWORD,        IPP_TAG_SUBSCRIPTION },
-  { "notify-recipient",                IPP_TAG_URI,            IPP_TAG_SUBSCRIPTION },
+  { "notify-recipient-uri",    IPP_TAG_URI,            IPP_TAG_SUBSCRIPTION },
   { "notify-time-interval",    IPP_TAG_INTEGER,        IPP_TAG_SUBSCRIPTION },
   { "notify-user-data",                IPP_TAG_STRING,         IPP_TAG_SUBSCRIPTION },
   { "number-up",               IPP_TAG_INTEGER,        IPP_TAG_JOB },
@@ -107,6 +100,7 @@ static const _ipp_option_t ipp_options[] =
   { "page-top-default",                IPP_TAG_INTEGER,        IPP_TAG_PRINTER },
   { "penwidth",                        IPP_TAG_INTEGER,        IPP_TAG_JOB },
   { "penwidth-default",                IPP_TAG_INTEGER,        IPP_TAG_PRINTER },
+  { "port-monitor",             IPP_TAG_NAME,           IPP_TAG_PRINTER },
   { "ppi",                     IPP_TAG_INTEGER,        IPP_TAG_JOB },
   { "ppi-default",             IPP_TAG_INTEGER,        IPP_TAG_PRINTER },
   { "prettyprint",             IPP_TAG_BOOLEAN,        IPP_TAG_JOB },
@@ -117,6 +111,7 @@ static const _ipp_option_t ipp_options[] =
   { "printer-info",            IPP_TAG_TEXT,           IPP_TAG_PRINTER },
   { "printer-is-accepting-jobs",IPP_TAG_BOOLEAN,       IPP_TAG_PRINTER },
   { "printer-is-shared",       IPP_TAG_BOOLEAN,        IPP_TAG_PRINTER },
+  { "printer-location",                IPP_TAG_TEXT,           IPP_TAG_PRINTER },
   { "printer-make-and-model",  IPP_TAG_TEXT,           IPP_TAG_PRINTER },
   { "printer-more-info",       IPP_TAG_URI,            IPP_TAG_PRINTER },
   { "printer-op-policy",       IPP_TAG_NAME,           IPP_TAG_PRINTER },
@@ -570,5 +565,5 @@ compare_ipp_options(_ipp_option_t *a,       /* I - First option */
 
 
 /*
- * End of "$Id: encode.c 6267 2007-02-11 23:24:22Z mike $".
+ * End of "$Id: encode.c 6649 2007-07-11 21:46:42Z mike $".
  */