Handle some more compound makes (Issue #1313)

diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index 22ef145303e1b6f571673417c3904ac618ba171e..538e787cb0ac16a2f76d65a8513c9d8532a93710 100644 (file)
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -3339,7 +3339,12 @@ _ppdCreateFromIPP(char   *buffer,        /* I - Filename buffer */
     cupsCopyString(make, "Unknown", sizeof(make));
   }
 
     cupsCopyString(make, "Unknown", sizeof(make));
   }
 

-  if (!_cups_strncasecmp(make, "Hewlett Packard ", 16) || !_cups_strncasecmp(make, "Hewlett-Packard ", 16))
+  if (!_cups_strncasecmp(make, "Fuji Xerox ", 11))
+  {
+    model = make + 11;
+    cupsCopyString(make, "Fuji Xerox", sizeof(make));
+  }
+  else if (!_cups_strncasecmp(make, "Hewlett Packard ", 16) || !_cups_strncasecmp(make, "Hewlett-Packard ", 16))

   {
    /*
     * Normalize HP printer make and model...
   {
    /*
     * Normalize HP printer make and model...


@@ -3351,6 +3356,11 @@ _ppdCreateFromIPP(char   *buffer,        /* I - Filename buffer */
     if (!_cups_strncasecmp(model, "HP ", 3))
       model += 3;
   }
     if (!_cups_strncasecmp(model, "HP ", 3))
       model += 3;
   }

+  else if (!_cups_strncasecmp(make, "KONICA MINOLTA ", 15))
+  {
+    model = make + 15;
+    cupsCopyString(make, "KONICA MINOLTA", sizeof(make));
+  }

   else if ((mptr = strchr(make, ' ')) != NULL)
   {
    /*
   else if ((mptr = strchr(make, ' ')) != NULL)
   {
    /*