diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-11-08 00:30:03 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-11-08 00:30:03 +0000 |
| commit | a2326b5b72c5117a00d4342dde8e4d20ff41defe (patch) | |
| tree | ecd2d60a15f7bad184a6f6e7c20f846e8a4cfadf /notifier | |
| parent | d7225fc298cb8397b85758198e70fc5399a44720 (diff) | |
Merge changes from CUPS 1.6svn-r10112.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3486 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'notifier')
| -rw-r--r-- | notifier/mailto.c | 2 | ||||
| -rw-r--r-- | notifier/rss.c | 3 | ||||
| -rw-r--r-- | notifier/testnotify.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/notifier/mailto.c b/notifier/mailto.c index 7ee15519d..da2db951d 100644 --- a/notifier/mailto.c +++ b/notifier/mailto.c @@ -632,7 +632,7 @@ print_attributes(ipp_t *ipp, /* I - IPP request */ fprintf(stderr, "DEBUG: %*s%s:\n\n", indent - 4, "", ippTagString(group)); } - _ippAttrString(attr, buffer, sizeof(buffer)); + ippAttributeString(attr, buffer, sizeof(buffer)); fprintf(stderr, "DEBUG: %*s%s (%s%s) %s", indent, "", attr->name, attr->num_values > 1 ? "1setOf " : "", diff --git a/notifier/rss.c b/notifier/rss.c index 9c9aa7553..f42c921a2 100644 --- a/notifier/rss.c +++ b/notifier/rss.c @@ -3,7 +3,7 @@ * * RSS notifier for CUPS. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2011 by Apple Inc. * Copyright 2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -33,6 +33,7 @@ #include <cups/string-private.h> #include <cups/array.h> #include <sys/select.h> +#include <cups/ipp-private.h> /* TODO: Update so we don't need this */ /* diff --git a/notifier/testnotify.c b/notifier/testnotify.c index 7e91f18cb..faa846d08 100644 --- a/notifier/testnotify.c +++ b/notifier/testnotify.c @@ -113,7 +113,7 @@ print_attributes(ipp_t *ipp, /* I - IPP request */ fprintf(stderr, "DEBUG: %*s%s:\n\n", indent - 4, "", ippTagString(group)); } - _ippAttrString(attr, buffer, sizeof(buffer)); + ippAttributeString(attr, buffer, sizeof(buffer)); fprintf(stderr, "DEBUG: %*s%s (%s%s) %s", indent, "", attr->name, attr->num_values > 1 ? "1setOf " : "", |