|
 |
fa2e636 |
diff -up cups-1.4.2/scheduler/ipp.c.str3428 cups-1.4.2/scheduler/ipp.c
|
|
|
fa2e636 |
--- cups-1.4.2/scheduler/ipp.c.str3428 2009-12-08 12:24:31.177373309 +0000
|
|
|
fa2e636 |
+++ cups-1.4.2/scheduler/ipp.c 2009-12-08 12:27:33.910498083 +0000
|
|
|
fa2e636 |
@@ -1860,8 +1860,6 @@ add_job(cupsd_client_t *con, /* I - Cl
|
|
|
fa2e636 |
"job-media-sheets-completed", 0);
|
|
|
fa2e636 |
ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_URI, "job-printer-uri", NULL,
|
|
|
fa2e636 |
printer->uri);
|
|
|
fa2e636 |
- ippAddString(job->attrs, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
|
|
|
fa2e636 |
- title);
|
|
|
fa2e636 |
|
|
|
fa2e636 |
if ((attr = ippFindAttribute(job->attrs, "job-k-octets",
|
|
|
fa2e636 |
IPP_TAG_INTEGER)) != NULL)
|
|
|
fa2e636 |
@@ -3438,7 +3436,7 @@ apple_register_profiles(
|
|
|
fa2e636 |
num_profiles ++;
|
|
|
fa2e636 |
}
|
|
|
fa2e636 |
|
|
|
fa2e636 |
-
|
|
|
fa2e636 |
+
|
|
|
fa2e636 |
/*
|
|
|
fa2e636 |
* If we have profiles, add them...
|
|
|
fa2e636 |
*/
|
|
|
fa2e636 |
@@ -3484,7 +3482,7 @@ apple_register_profiles(
|
|
|
fa2e636 |
snprintf(q_keyword, sizeof(q_keyword), "Default%s", attr->value);
|
|
|
fa2e636 |
q2_attr = ppdFindAttr(ppd, q_keyword, NULL);
|
|
|
fa2e636 |
}
|
|
|
fa2e636 |
- else
|
|
|
fa2e636 |
+ else
|
|
|
fa2e636 |
q2_attr = ppdFindAttr(ppd, "DefaultMediaType", NULL);
|
|
|
fa2e636 |
|
|
|
fa2e636 |
if (q2_attr && q2_attr->value && q2_attr->value[0])
|
|
|
fa2e636 |
@@ -3498,7 +3496,7 @@ apple_register_profiles(
|
|
|
fa2e636 |
snprintf(q_keyword, sizeof(q_keyword), "Default%s", attr->value);
|
|
|
fa2e636 |
q3_attr = ppdFindAttr(ppd, q_keyword, NULL);
|
|
|
fa2e636 |
}
|
|
|
fa2e636 |
- else
|
|
|
fa2e636 |
+ else
|
|
|
fa2e636 |
q3_attr = ppdFindAttr(ppd, "DefaultResolution", NULL);
|
|
|
fa2e636 |
|
|
|
fa2e636 |
if (q3_attr && q3_attr->value && q3_attr->value[0])
|
|
|
fa2e636 |
@@ -3667,7 +3665,7 @@ apple_register_profiles(
|
|
|
fa2e636 |
attr = ppdFindAttr(ppd, "DefaultColorSpace", NULL);
|
|
|
fa2e636 |
|
|
|
fa2e636 |
num_profiles = (attr && ppd->colorspace == PPD_CS_GRAY) ? 1 : 2;
|
|
|
fa2e636 |
-
|
|
|
fa2e636 |
+
|
|
|
fa2e636 |
if ((profiles = calloc(num_profiles, sizeof(CMDeviceProfileArray))) == NULL)
|
|
|
fa2e636 |
{
|
|
|
fa2e636 |
cupsdLogMessage(CUPSD_LOG_ERROR,
|
|
|
fa2e636 |
@@ -4762,7 +4760,7 @@ check_quotas(cupsd_client_t *con, /* I
|
|
|
fa2e636 |
if (q->page_count == -4) /* special case: unlimited user */
|
|
|
fa2e636 |
{
|
|
|
fa2e636 |
cupsdLogMessage(CUPSD_LOG_INFO,
|
|
|
fa2e636 |
- "User \"%s\" request approved for printer %s (%s): "
|
|
|
fa2e636 |
+ "User \"%s\" request approved for printer %s (%s): "
|
|
|
fa2e636 |
"unlimited quota.",
|
|
|
fa2e636 |
username, p->name, p->info);
|
|
|
fa2e636 |
q->page_count = 0; /* allow user to print */
|