mirror of https://gitee.com/openkylin/cups.git
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From: Till Kampetter <till.kampetter@gmail.com>
|
|
Date: Tue, 9 Aug 2016 18:11:36 +0200
|
|
Subject: CUPS removes the "(recommended)" comments of the NickNames of
|
|
Foomatic PPDs when listing available PPDs. This patch removes this removal
|
|
action.
|
|
|
|
Patch-Name: reactivate_recommended_driver.patch
|
|
---
|
|
scheduler/cups-driverd.cxx | 10 ----------
|
|
1 file changed, 10 deletions(-)
|
|
|
|
diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
|
|
index 85516eb..874eb3c 100644
|
|
--- a/scheduler/cups-driverd.cxx
|
|
+++ b/scheduler/cups-driverd.cxx
|
|
@@ -240,7 +240,6 @@ add_ppd(const char *filename, /* I - PPD filename */
|
|
const char *scheme) /* I - PPD scheme */
|
|
{
|
|
ppd_info_t *ppd; /* PPD */
|
|
- char *recommended; /* Foomatic driver string */
|
|
|
|
|
|
/*
|
|
@@ -278,15 +277,6 @@ add_ppd(const char *filename, /* I - PPD filename */
|
|
strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
|
|
strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
|
|
|
|
- /*
|
|
- * Strip confusing (and often wrong) "recommended" suffix added by
|
|
- * Foomatic drivers...
|
|
- */
|
|
-
|
|
- if ((recommended = strstr(ppd->record.make_and_model,
|
|
- " (recommended)")) != NULL)
|
|
- *recommended = '\0';
|
|
-
|
|
/*
|
|
* Add the PPD to the PPD arrays...
|
|
*/
|