summaryrefslogtreecommitdiff
path: root/cups/notify.c
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2013-03-11 13:57:36 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2013-03-11 13:57:36 +0000
commitcb7f98ee7f57af247aacb94977c8f744a1d02eca (patch)
tree9a777871fa4e4f9928ff960d52ffce2343df29d8 /cups/notify.c
parentc5b24bfa983a8b50262d8c3dd037e0181cfaae61 (diff)
downloadcups-cb7f98ee7f57af247aacb94977c8f744a1d02eca.tar.gz
Sync up with CUPS 1.7svn-r10893
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4216 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/notify.c')
-rw-r--r--cups/notify.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/cups/notify.c b/cups/notify.c
index 9d520f17d..78c78cec6 100644
--- a/cups/notify.c
+++ b/cups/notify.c
@@ -3,7 +3,7 @@
*
* Notification routines for CUPS.
*
- * Copyright 2007-2012 by Apple Inc.
+ * Copyright 2007-2013 by Apple Inc.
* Copyright 2005-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -83,25 +83,25 @@ cupsNotifySubject(cups_lang_t *lang, /* I - Language data */
switch (job_state->values[0].integer)
{
- case IPP_JOB_PENDING :
+ case IPP_JSTATE_PENDING :
state = _cupsLangString(lang, _("pending"));
break;
- case IPP_JOB_HELD :
+ case IPP_JSTATE_HELD :
state = _cupsLangString(lang, _("held"));
break;
- case IPP_JOB_PROCESSING :
+ case IPP_JSTATE_PROCESSING :
state = _cupsLangString(lang, _("processing"));
break;
- case IPP_JOB_STOPPED :
+ case IPP_JSTATE_STOPPED :
state = _cupsLangString(lang, _("stopped"));
break;
- case IPP_JOB_CANCELED :
+ case IPP_JSTATE_CANCELED :
state = _cupsLangString(lang, _("canceled"));
break;
- case IPP_JOB_ABORTED :
+ case IPP_JSTATE_ABORTED :
state = _cupsLangString(lang, _("aborted"));
break;
- case IPP_JOB_COMPLETED :
+ case IPP_JSTATE_COMPLETED :
state = _cupsLangString(lang, _("completed"));
break;
default :
@@ -127,13 +127,13 @@ cupsNotifySubject(cups_lang_t *lang, /* I - Language data */
switch (printer_state->values[0].integer)
{
- case IPP_PRINTER_IDLE :
+ case IPP_PSTATE_IDLE :
state = _cupsLangString(lang, _("idle"));
break;
- case IPP_PRINTER_PROCESSING :
+ case IPP_PSTATE_PROCESSING :
state = _cupsLangString(lang, _("processing"));
break;
- case IPP_PRINTER_STOPPED :
+ case IPP_PSTATE_STOPPED :
state = _cupsLangString(lang, _("stopped"));
break;
default :