CUPS printing: Do not add scanners to the printer list.

printing/backend/print_backend_cups.cc

Index: printing/backend/print_backend_cups.cc
===================================================================
--- printing/backend/print_backend_cups.cc	(revision 95638)
+++ printing/backend/print_backend_cups.cc	(working copy)
@@ -21,7 +21,10 @@
 #include "printing/backend/cups_helper.h"
 #include "printing/backend/print_backend_consts.h"
 
-#if !defined(OS_MACOSX)
+#if defined(OS_MACOSX)
+// Mac still builds against the 10.5 SDK, which does not have this in cups.h.
+#define CUPS_PRINTER_SCANNER 0x2000000
+#else
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 
 namespace {
@@ -71,12 +74,13 @@
     base::LINKER_INITIALIZED);
 
 }  // namespace
-#endif
+#endif  // defined(OS_MACOSX)
 
 namespace printing {
 
 static const char kCUPSPrinterInfoOpt[] = "printer-info";
 static const char kCUPSPrinterStateOpt[] = "printer-state";
+static const char kCUPSPrinterTypeOpt[] = "printer-type";
 
 class PrintBackendCUPS : public PrintBackend {
  public:
@@ -126,6 +130,17 @@
   for (int printer_index = 0; printer_index < num_dests; printer_index++) {
     const cups_dest_t& printer = destinations[printer_index];
 
+    // CUPS can have 'printers' that are actually scanners. (not MFC)
+    // At least on Mac. Check for scanners and skip them.
+    const char* type_str = cupsGetOption(kCUPSPrinterTypeOpt,
+        printer.num_options, printer.options);
+    if (type_str != NULL) {
+      int type = 0;
+      base::StringToInt(type_str, &type);

[kmadhusu, 2011/08/08 20:09:35]

nit: Handle if (!base::StringToInt(...))

[Lei Zhang, 2011/08/08 20:27:25]

Done.

+      if (type & CUPS_PRINTER_SCANNER)
+        continue;
+    }
+
     PrinterBasicInfo printer_info;
     printer_info.printer_name = printer.name;
     printer_info.is_default = printer.is_default;