diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-12-16 00:13:28 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-12-16 00:13:28 +0000 |
| commit | 5a662dc06039959a7a12925c21abf9d2e233b618 (patch) | |
| tree | 9c4fe0ab589e48dde81426ce2488cd0bca781567 /berkeley | |
| parent | ef55b7453303a9a2b20590815c967d044a13da1d (diff) | |
| download | cups-5a662dc06039959a7a12925c21abf9d2e233b618.tar.gz | |
Merge changes from CUPS 1.5svn-r8933.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1788 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'berkeley')
| -rw-r--r-- | berkeley/lpq.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/berkeley/lpq.c b/berkeley/lpq.c index b744848f7..8304bdc4e 100644 --- a/berkeley/lpq.c +++ b/berkeley/lpq.c @@ -340,7 +340,18 @@ show_jobs(const char *command, /* I - Command name */ char resource[1024]; /* Resource string */ char rankstr[255]; /* Rank string */ char namestr[1024]; /* Job name string */ - static const char *ranks[10] = /* Ranking strings */ + static const char * const jobattrs[] =/* Job attributes we want to see */ + { + "copies", + "job-id", + "job-k-octets", + "job-name", + "job-originating-user-name", + "job-printer-uri", + "job-priority", + "job-state" + }; + static const char * const ranks[10] = /* Ranking strings */ { "th", "st", @@ -368,6 +379,7 @@ show_jobs(const char *command, /* I - Command name */ * attributes-charset * attributes-natural-language * job-uri or printer-uri + * requested-attributes */ request = ippNewRequest(id ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS); @@ -397,6 +409,10 @@ show_jobs(const char *command, /* I - Command name */ ippAddBoolean(request, IPP_TAG_OPERATION, "my-jobs", 1); } + ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, + "requested-attributes", + (int)(sizeof(jobattrs) / sizeof(jobattrs[0])), NULL, jobattrs); + /* * Do the request and get back a response... */ |