Merge changes from CUPS 1.5svn-r9374.

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

diff --git a/cups/notify.c b/cups/notify.c
index c9d56ca8d6c093d6e915aed8fce2c7ce437835be..b514c7db363458fc19977c1bc2fe35123f9a78d5 100644 (file)
--- a/cups/notify.c
+++ b/cups/notify.c
@@ -1,25 +1,16 @@
 /*
- * "$Id$"
+ * "$Id: notify.c 7337 2008-02-22 04:44:04Z mike $"
  *
- *   Notification routines for the Common UNIX Printing System (CUPS).
+ *   Notification routines for CUPS.
  *
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 2005-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   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.
  *
@@ -34,18 +25,18 @@
  * Include necessary headers...
  */
 
-#include "globals.h"
+#include "cups-private.h"
 
 
 /*
  * 'cupsNotifySubject()' - Return the subject for the given notification message.
  *
- * The returned string must be freed by the caller using free().
+ * The returned string must be freed by the caller using @code free@.
  *
- * @since CUPS 1.2@
+ * @since CUPS 1.2/Mac OS X 10.5@
  */
 
-char *                                 /* O - Subject string or NULL */
+char *                                 /* O - Subject string or @code NULL@ */
 cupsNotifySubject(cups_lang_t *lang,   /* I - Language data */
                   ipp_t       *event)  /* I - Event data */
 {
@@ -104,7 +95,7 @@ cupsNotifySubject(cups_lang_t *lang, /* I - Language data */
       case IPP_JOB_STOPPED :
           state = _cupsLangString(lang, _("stopped"));
          break;
-      case IPP_JOB_CANCELLED :
+      case IPP_JOB_CANCELED :
           state = _cupsLangString(lang, _("canceled"));
          break;
       case IPP_JOB_ABORTED :
@@ -171,12 +162,12 @@ cupsNotifySubject(cups_lang_t *lang,      /* I - Language data */
 /*
  * 'cupsNotifyText()' - Return the text for the given notification message.
  *
- * The returned string must be freed by the caller using free().
+ * The returned string must be freed by the caller using @code free@.
  *
- * @since CUPS 1.2@
+ * @since CUPS 1.2/Mac OS X 10.5@
  */
 
-char *                                 /* O - Message text or NULL */
+char *                                 /* O - Message text or @code NULL@ */
 cupsNotifyText(cups_lang_t *lang,      /* I - Language data */
                ipp_t       *event)     /* I - Event data */
 {
@@ -207,5 +198,5 @@ cupsNotifyText(cups_lang_t *lang,   /* I - Language data */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: notify.c 7337 2008-02-22 04:44:04Z mike $".
  */