diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2014-06-13 00:08:32 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2014-06-13 00:08:32 +0000 |
| commit | 96be8b6c6eee221df6820e2a6fd3f068223aa911 (patch) | |
| tree | a9a1143b81bc23c48531bb9e4121e7ace818a159 /cgi-bin | |
| parent | b4a8492a632e030877b0f39bffc2be6e89e88fc4 (diff) | |
Make "Cancel All Jobs" use the Cancel-Jobs operation instead of Purge-Jobs
(STR #1914)
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11928 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cgi-bin')
| -rw-r--r-- | cgi-bin/classes.c | 8 | ||||
| -rw-r--r-- | cgi-bin/printers.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/cgi-bin/classes.c b/cgi-bin/classes.c index 3217bb159..2685e66a3 100644 --- a/cgi-bin/classes.c +++ b/cgi-bin/classes.c @@ -161,8 +161,8 @@ main(void) do_class_op(http, pclass, CUPS_ACCEPT_JOBS, cgiText(_("Accept Jobs"))); else if (!strcmp(op, "reject-jobs")) do_class_op(http, pclass, CUPS_REJECT_JOBS, cgiText(_("Reject Jobs"))); - else if (!strcmp(op, "purge-jobs")) - do_class_op(http, pclass, IPP_PURGE_JOBS, cgiText(_("Purge Jobs"))); + else if (!strcmp(op, "cancel-jobs")) + do_class_op(http, pclass, IPP_OP_CANCEL_JOBS, cgiText(_("Cancel Jobs"))); else if (!_cups_strcasecmp(op, "print-test-page")) cgiPrintTestPage(http, pclass); else if (!_cups_strcasecmp(op, "move-jobs")) @@ -278,8 +278,8 @@ do_class_op(http_t *http, /* I - HTTP connection */ cgiCopyTemplateLang("printer-accept.tmpl"); else if (op == CUPS_REJECT_JOBS) cgiCopyTemplateLang("printer-reject.tmpl"); - else if (op == IPP_PURGE_JOBS) - cgiCopyTemplateLang("printer-purge.tmpl"); + else if (op == IPP_OP_CANCEL_JOBS) + cgiCopyTemplateLang("printer-cancel-jobs.tmpl"); } cgiEndHTML(); diff --git a/cgi-bin/printers.c b/cgi-bin/printers.c index 7b9e95556..c713c68f4 100644 --- a/cgi-bin/printers.c +++ b/cgi-bin/printers.c @@ -164,8 +164,8 @@ main(void) do_printer_op(http, printer, CUPS_ACCEPT_JOBS, cgiText(_("Accept Jobs"))); else if (!strcmp(op, "reject-jobs")) do_printer_op(http, printer, CUPS_REJECT_JOBS, cgiText(_("Reject Jobs"))); - else if (!strcmp(op, "purge-jobs")) - do_printer_op(http, printer, IPP_PURGE_JOBS, cgiText(_("Purge Jobs"))); + else if (!strcmp(op, "cancel-jobs")) + do_printer_op(http, printer, IPP_OP_CANCEL_JOBS, cgiText(_("Cancel Jobs"))); else if (!_cups_strcasecmp(op, "print-self-test-page")) cgiPrintCommand(http, printer, "PrintSelfTestPage", cgiText(_("Print Self-Test Page"))); @@ -285,8 +285,8 @@ do_printer_op(http_t *http, /* I - HTTP connection */ cgiCopyTemplateLang("printer-accept.tmpl"); else if (op == CUPS_REJECT_JOBS) cgiCopyTemplateLang("printer-reject.tmpl"); - else if (op == IPP_PURGE_JOBS) - cgiCopyTemplateLang("printer-purge.tmpl"); + else if (op == IPP_OP_CANCEL_JOBS) + cgiCopyTemplateLang("printer-cancel-jobs.tmpl"); } cgiEndHTML(); |