diff options
| author | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-11-07 19:32:27 +0000 |
|---|---|---|
| committer | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-11-07 19:32:27 +0000 |
| commit | 26d47ec6888969c3a3957f55c9eed0778813b94a (patch) | |
| tree | eec718b11e7f559cd0346c78363d68f728e9e106 /scheduler | |
| parent | 2abf387cae0cce4bf3a0a259ded28ef0269aec47 (diff) | |
| download | cups-26d47ec6888969c3a3957f55c9eed0778813b94a.tar.gz | |
Load cups into easysw/current.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@238 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler')
| -rw-r--r-- | scheduler/ipp.c | 20 | ||||
| -rw-r--r-- | scheduler/job.c | 5 |
2 files changed, 13 insertions, 12 deletions
diff --git a/scheduler/ipp.c b/scheduler/ipp.c index 7b0e43247..15803a433 100644 --- a/scheduler/ipp.c +++ b/scheduler/ipp.c @@ -1,5 +1,5 @@ /* - * "$Id: ipp.c 6032 2006-10-12 19:19:47Z mike $" + * "$Id: ipp.c 6052 2006-10-20 20:35:41Z mike $" * * IPP routines for the Common UNIX Printing System (CUPS) scheduler. * @@ -4020,14 +4020,14 @@ copy_model(cupsd_client_t *con, /* I - Client connection */ if ((!strcmp(system_paper, "Letter") && have_letter) || (!strcmp(system_paper, "A4") && have_a4)) { - num_defaults = ppd_add_default("PageSize", system_paper, - num_defaults, &defaults); - num_defaults = ppd_add_default("PageRegion", system_paper, - num_defaults, &defaults); - num_defaults = ppd_add_default("PaperDimension", system_paper, - num_defaults, &defaults); - num_defaults = ppd_add_default("ImageableArea", system_paper, - num_defaults, &defaults); + num_defaults = cupsAddOption("PageSize", system_paper, + num_defaults, &defaults); + num_defaults = cupsAddOption("PageRegion", system_paper, + num_defaults, &defaults); + num_defaults = cupsAddOption("PaperDimension", system_paper, + num_defaults, &defaults); + num_defaults = cupsAddOption("ImageableArea", system_paper, + num_defaults, &defaults); } } #endif /* HAVE_LIBPAPER */ @@ -9158,5 +9158,5 @@ validate_user(cupsd_job_t *job, /* I - Job */ /* - * End of "$Id: ipp.c 6032 2006-10-12 19:19:47Z mike $". + * End of "$Id: ipp.c 6052 2006-10-20 20:35:41Z mike $". */ diff --git a/scheduler/job.c b/scheduler/job.c index 4fd52b0b5..47a837564 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -1,5 +1,5 @@ /* - * "$Id: job.c 6032 2006-10-12 19:19:47Z mike $" + * "$Id: job.c 6061 2006-10-23 00:26:52Z mike $" * * Job management routines for the Common UNIX Printing System (CUPS). * @@ -1775,6 +1775,7 @@ cupsdUpdateJob(cupsd_job_t *job) /* I - Job to check */ strlcpy(job->printer->state_message, message, sizeof(job->printer->state_message)); cupsdAddPrinterHistory(job->printer); + event |= CUPSD_EVENT_PRINTER_STATE_CHANGED; } if (!strchr(job->status_buffer->buffer, '\n')) @@ -3468,5 +3469,5 @@ unload_job(cupsd_job_t *job) /* I - Job */ /* - * End of "$Id: job.c 6032 2006-10-12 19:19:47Z mike $". + * End of "$Id: job.c 6061 2006-10-23 00:26:52Z mike $". */ |