Remove all of the Subversion keywords from various source files.

[thirdparty/cups.git] / cups / notify.c

diff --git a/cups/notify.c b/cups/notify.c
index b514c7db363458fc19977c1bc2fe35123f9a78d5..cb005497d2619560cf4525d1f7e6c06597fba990 100644 (file)
--- a/cups/notify.c
+++ b/cups/notify.c
@@ -1,24 +1,16 @@
 /*
- * "$Id: notify.c 7337 2008-02-22 04:44:04Z mike $"
+ * Notification routines for CUPS.
  *
- *   Notification routines for CUPS.
+ * Copyright 2007-2013 by Apple Inc.
+ * Copyright 2005-2006 by Easy Software Products.
  *
- *   Copyright 2007-2010 by Apple Inc.
- *   Copyright 2005-2006 by Easy Software Products.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file.  If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   cupsNotifySubject() - Return the subject for the given notification
- *                         message.
- *   cupsNotifyText()    - Return the text for the given notification message.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -33,7 +25,7 @@
  *
  * The returned string must be freed by the caller using @code free@.
  *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
  */
 
 char *                                 /* O - Subject string or @code NULL@ */
@@ -83,25 +75,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 +119,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 :
@@ -164,7 +156,7 @@ cupsNotifySubject(cups_lang_t *lang,        /* I - Language data */
  *
  * The returned string must be freed by the caller using @code free@.
  *
- * @since CUPS 1.2/Mac OS X 10.5@
+ * @since CUPS 1.2/OS X 10.5@
  */
 
 char *                                 /* O - Message text or @code NULL@ */
@@ -195,8 +187,3 @@ cupsNotifyText(cups_lang_t *lang,   /* I - Language data */
 
   return (strdup(notify_text->values[0].string.text));
 }
-
-
-/*
- * End of "$Id: notify.c 7337 2008-02-22 04:44:04Z mike $".
- */