Merge changes from CUPS 1.5svn-r9352.

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

diff --git a/scheduler/job.h b/scheduler/job.h
index 16dd09ff7cfc587fe25f852bdc01c47ae9dab516..2268886b04ccb3ffdb0cff20a69a6482438e4b15 100644 (file)
--- a/scheduler/job.h
+++ b/scheduler/job.h
@@ -1,9 +1,9 @@
 /*
  * "$Id: job.h 7883 2008-08-28 20:38:13Z mike $"
  *
- *   Print job definitions for the Common UNIX Printing System (CUPS) scheduler.
+ *   Print job definitions for the CUPS scheduler.
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -40,6 +40,7 @@ struct cupsd_job_s                    /**** Job request ****/
   char                 *username;      /* Printing user */
   char                 *dest;          /* Destination printer or class */
   cups_ptype_t         dtype;          /* Destination type */
+  cupsd_printer_t      *printer;       /* Printer this job is assigned to */
   int                  num_files;      /* Number of files in job */
   mime_type_t          **filetypes;    /* File types */
   int                  *compressions;  /* Compression status of each file */
@@ -68,7 +69,6 @@ struct cupsd_job_s                    /**** Job request ****/
                                        /* Filter process IDs, 0 terminated */
   int                  backend;        /* Backend process ID */
   int                  status;         /* Status code from filters */
-  cupsd_printer_t      *printer;       /* Printer this job is assigned to */
   int                  tries;          /* Number of tries for this job */
   char                 *auth_username, /* AUTH_USERNAME environment variable,
                                          * if any */