Merge changes from CUPS 1.5svn-r9374.

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

diff --git a/cups/notify.c b/cups/notify.c
index 32ff2c805d22e58367ba8823c3ee50726f6e8415..b514c7db363458fc19977c1bc2fe35123f9a78d5 100644 (file)
--- a/cups/notify.c
+++ b/cups/notify.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: notify.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$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-2008 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 2005-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -25,15 +25,15 @@
  * 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 @code NULL@ */
@@ -164,7 +164,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@
+ * @since CUPS 1.2/Mac OS X 10.5@
  */
 
 char *                                 /* O - Message text or @code NULL@ */
@@ -198,5 +198,5 @@ cupsNotifyText(cups_lang_t *lang,   /* I - Language data */
 
 
 /*
- * End of "$Id: notify.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: notify.c 7337 2008-02-22 04:44:04Z mike $".
  */