diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-06-15 00:37:13 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-06-15 00:37:13 +0000 |
| commit | f99f36983167d7ff4b3cf3348a252a465c48ff9c (patch) | |
| tree | b25381a9c6c206ff4ac9374bacefc560cee08a1d /scheduler/cups-driverd.cxx | |
| parent | d4d033982cd67de6be9e472ff79a5538874c1651 (diff) | |
| download | cups-f99f36983167d7ff4b3cf3348a252a465c48ff9c.tar.gz | |
Merge changes from CUPS 1.5rc1-r9833.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3318 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/cups-driverd.cxx')
| -rw-r--r-- | scheduler/cups-driverd.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx index 9e0e02005..abe026287 100644 --- a/scheduler/cups-driverd.cxx +++ b/scheduler/cups-driverd.cxx @@ -750,8 +750,11 @@ compare_ppds(const ppd_info_t *p0, /* I - First PPD file */ else if ((diff = cupsdCompareNames(p0->record.make_and_model, p1->record.make_and_model)) != 0) return (diff); + else if ((diff = strcmp(p0->record.languages[0], + p1->record.languages[0])) != 0) + return (diff); else - return (strcmp(p0->record.languages[0], p1->record.languages[0])); + return (compare_names(p0, p1)); } @@ -1408,7 +1411,9 @@ load_drv(const char *filename, /* I - Actual filename */ * Add a dummy entry for the file... */ - add_ppd(name, name, "", "", "", "", "", "", mtime, size, 0, + httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "drv", "", "", 0, + "/%s", name); + add_ppd(name, uri, "", "", "", "", "", "", mtime, size, 0, PPD_TYPE_DRV, "drv"); ChangedPPD = 1; |