diff options
| author | Michael R Sweet <michaelrsweet@gmail.com> | 2017-11-01 12:58:17 -0400 |
|---|---|---|
| committer | Michael R Sweet <michaelrsweet@gmail.com> | 2017-11-01 12:58:17 -0400 |
| commit | 87de8b54d748bea8d64bcab3b6fc61735ac78a5e (patch) | |
| tree | 8f01246aa88cc978c938e6af8bb2e744d79c494e /systemv | |
| parent | f1547f121cd10de60d57248a9de6df3982f451c4 (diff) | |
| download | cups-87de8b54d748bea8d64bcab3b6fc61735ac78a5e.tar.gz | |
Report when new jobs are being held (Issue #4761)
Diffstat (limited to 'systemv')
| -rw-r--r-- | systemv/cupsaccept.c | 8 | ||||
| -rw-r--r-- | systemv/lpstat.c | 16 |
2 files changed, 10 insertions, 14 deletions
diff --git a/systemv/cupsaccept.c b/systemv/cupsaccept.c index 5e5c18388..81955d1d5 100644 --- a/systemv/cupsaccept.c +++ b/systemv/cupsaccept.c @@ -2,7 +2,7 @@ * "cupsaccept", "cupsdisable", "cupsenable", and "cupsreject" commands for * CUPS. * - * Copyright 2007-2016 by Apple Inc. + * Copyright 2007-2017 by Apple Inc. * Copyright 1997-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -83,11 +83,11 @@ main(int argc, /* I - Number of command-line arguments */ switch (*opt) { case 'E' : /* Encrypt */ - #ifdef HAVE_SSL +#ifdef HAVE_SSL cupsSetEncryption(HTTP_ENCRYPT_REQUIRED); - #else +#else _cupsLangPrintf(stderr, _("%s: Sorry, no encryption support."), command); - #endif /* HAVE_SSL */ +#endif /* HAVE_SSL */ break; case 'U' : /* Username */ diff --git a/systemv/lpstat.c b/systemv/lpstat.c index cda457173..0ea69c65f 100644 --- a/systemv/lpstat.c +++ b/systemv/lpstat.c @@ -1795,20 +1795,16 @@ show_printers(const char *printers, /* I - Destinations */ switch (pstate) { case IPP_PRINTER_IDLE : - _cupsLangPrintf(stdout, - _("printer %s is idle. enabled since %s"), - printer, printer_state_time); + if (ippContainsString(reasons, "hold-new-jobs")) + _cupsLangPrintf(stdout, _("printer %s is holding new jobs. enabled since %s"), printer, printer_state_time); + else + _cupsLangPrintf(stdout, _("printer %s is idle. enabled since %s"), printer, printer_state_time); break; case IPP_PRINTER_PROCESSING : - _cupsLangPrintf(stdout, - _("printer %s now printing %s-%d. " - "enabled since %s"), - printer, printer, jobid, printer_state_time); + _cupsLangPrintf(stdout, _("printer %s now printing %s-%d. enabled since %s"), printer, printer, jobid, printer_state_time); break; case IPP_PRINTER_STOPPED : - _cupsLangPrintf(stdout, - _("printer %s disabled since %s -"), - printer, printer_state_time); + _cupsLangPrintf(stdout, _("printer %s disabled since %s -"), printer, printer_state_time); break; } |