Merge changes from CUPS 1.4svn-r7696.

[thirdparty/cups.git] / scheduler / printers.h

diff --git a/scheduler/printers.h b/scheduler/printers.h
index 7a19b973e02ff8d84785a975b525645156913b3a..0853b2edab6c8835a7e9df19d68d4a8274d97660 100644 (file)
--- a/scheduler/printers.h
+++ b/scheduler/printers.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.h 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: printers.h 7564 2008-05-15 00:57:43Z mike $"
  *
  *   Printer definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -86,6 +86,7 @@ typedef struct cupsd_printer_s
   const char   *auth_info_required[4]; /* Required authentication fields */
   char         *alert,                 /* PSX printer-alert value */
                *alert_description;     /* PSX printer-alert-description value */
+  time_t       marker_time;            /* Last time marker attributes were updated */
 
 #ifdef __APPLE__
   char         *recoverable;           /* com.apple.print.recoverable-message */
@@ -95,10 +96,12 @@ typedef struct cupsd_printer_s
   char         *reg_name,              /* Name used for service registration */
                *product,               /* PPD Product string */
                *pdl,                   /* pdl value for TXT record */
-               *txt_record;            /* TXT record contents */
-  int          txt_len;                /* TXT record length */
-  DNSServiceRef        dnssd_ipp_ref;          /* DNSServiceRegister ref for _ipp */
-  int          dnssd_ipp_fd;           /* File descriptor for DNSServiceRegister reference */
+               *ipp_txt,               /* IPP TXT record contents */
+               *printer_txt;           /* LPD TXT record contents */
+  int          ipp_len,                /* IPP TXT record length */
+               printer_len;            /* LPD TXT record length */
+  DNSServiceRef        ipp_ref,                /* Reference for _ipp._tcp,_cups */
+               printer_ref;            /* Reference for _printer._tcp */
 #endif /* HAVE_DNSSD */
 } cupsd_printer_t;
 
@@ -150,6 +153,8 @@ extern void         cupsdSaveAllPrinters(void);
 extern int             cupsdSetAuthInfoRequired(cupsd_printer_t *p,
                                                 const char *values,
                                                 ipp_attribute_t *attr);
+extern void            cupsdSetPrinterAttr(cupsd_printer_t *p,
+                                           const char *name, char *value);
 extern void            cupsdSetPrinterAttrs(cupsd_printer_t *p);
 extern void            cupsdSetPrinterReasons(cupsd_printer_t *p,
                                               const char *s);
@@ -157,6 +162,9 @@ extern void         cupsdSetPrinterState(cupsd_printer_t *p, ipp_pstate_t s,
                                             int update);
 #define                        cupsdStartPrinter(p,u) cupsdSetPrinterState((p), IPP_PRINTER_IDLE, (u))
 extern void            cupsdStopPrinter(cupsd_printer_t *p, int update);
+extern int             cupsdUpdatePrinterPPD(cupsd_printer_t *p,
+                                             int num_keywords,
+                                             cups_option_t *keywords);
 extern void            cupsdUpdatePrinters(void);
 extern cupsd_quota_t   *cupsdUpdateQuota(cupsd_printer_t *p,
                                          const char *username, int pages,
@@ -168,5 +176,5 @@ extern void         cupsdWritePrintcap(void);
 
 
 /*
- * End of "$Id: printers.h 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: printers.h 7564 2008-05-15 00:57:43Z mike $".
  */