From b3e3f6026bca4ae56ff5d109d76961e0f47deab4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 20 Nov 2014 15:10:50 -0600 Subject: Fix duplicated printer driver entries This relates to Bug 2191 --- tdeprint/cups/make_driver_db_cups.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'tdeprint') diff --git a/tdeprint/cups/make_driver_db_cups.cpp b/tdeprint/cups/make_driver_db_cups.cpp index c658181a7..a6dec1169 100644 --- a/tdeprint/cups/make_driver_db_cups.cpp +++ b/tdeprint/cups/make_driver_db_cups.cpp @@ -203,6 +203,13 @@ void initPpd(const char *dirname) } } +void initCompressedPpd(const char *dirname) +{ + // HACK + // The initPpd function actually handles the compressed PPDs as well, so do nothing here + // If we were to rerun initPpd here then all drivers would be duplicated! +} + int parsePpdFile(const char *filename, const char *origin, const char *metadata, FILE *output_file) { gzFile ppd_file; @@ -350,7 +357,7 @@ int parseCompressedPpdFile(const char *ppdfilename, const char *origin, const ch int main(int argc, char *argv[]) { registerHandler("ppd:", initPpd, parsePpdFile); - registerHandler("compressed-ppd:", initPpd, parseCompressedPpdFile); + registerHandler("compressed-ppd:", initCompressedPpd, parseCompressedPpdFile); initFoomatic(); return execute(argc, argv); } -- cgit v1.2.1