diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-05-18 22:09:10 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-05-18 22:09:10 +0000 |
commit | 68b10830fa5eca364644a90bb564821698611ff7 (patch) | |
tree | 7919621a55ced69185e55ac7a136957da1ab6e89 /scheduler/classes.c | |
parent | 536bc2c6525745b914830119c65824faf63e15e8 (diff) | |
download | cups-68b10830fa5eca364644a90bb564821698611ff7.tar.gz |
Merge changes from CUPS 1.4svn-r8659
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1516 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/classes.c')
-rw-r--r-- | scheduler/classes.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/scheduler/classes.c b/scheduler/classes.c index b836962cf..87c3d07bc 100644 --- a/scheduler/classes.c +++ b/scheduler/classes.c @@ -285,6 +285,7 @@ cupsdFindClass(const char *name) /* I - Name of class */ void cupsdLoadAllClasses(void) { + int i; /* Looping var */ cups_file_t *fp; /* classes.conf file */ int linenum; /* Current line number */ char line[4096], /* Line from file */ @@ -456,7 +457,17 @@ cupsdLoadAllClasses(void) else if (!strcasecmp(value, "stopped")) { p->state = IPP_PRINTER_STOPPED; - cupsdSetPrinterReasons(p, "+paused"); + + for (i = 0 ; i < p->num_reasons; i ++) + if (!strcmp("paused", p->reasons[i])) + break; + + if (i >= p->num_reasons && + p->num_reasons < (int)(sizeof(p->reasons) / sizeof(p->reasons[0]))) + { + p->reasons[p->num_reasons] = _cupsStrAlloc("paused"); + p->num_reasons ++; + } } else cupsdLogMessage(CUPSD_LOG_ERROR, |