[simple-scan] Support Canon DR-C240 ADF_BOTH options



commit 9df6f9a6d8384010be9f66dd4b17b3c8d3c44336
Author: Bartosz Kosiorek <gang65 poczta onet pl>
Date:   Wed Oct 27 13:29:33 2021 +0200

    Support Canon DR-C240 ADF_BOTH options
    
    Inspired by:
    https://github.com/GNOME/simple-scan/pull/2

 build-aux/flatpak/org.gnome.SimpleScan.json | 1 +
 src/scanner.vala                            | 4 ++++
 2 files changed, 5 insertions(+)
---
diff --git a/build-aux/flatpak/org.gnome.SimpleScan.json b/build-aux/flatpak/org.gnome.SimpleScan.json
index f41d5e23..0b453dce 100644
--- a/build-aux/flatpak/org.gnome.SimpleScan.json
+++ b/build-aux/flatpak/org.gnome.SimpleScan.json
@@ -51,6 +51,7 @@
             "sources" : [
                 {
                     "type" : "git",
+                    "branch" : "main",
                     "url" : "https://github.com/hughsie/libgusb.git";
                 }
             ]
diff --git a/src/scanner.vala b/src/scanner.vala
index cc7e9727..d968aecb 100644
--- a/src/scanner.vala
+++ b/src/scanner.vala
@@ -1103,6 +1103,10 @@ public class Scanner : Object
 
             /* Non-standard Epson GT-S50 ADF options */
             option = get_option_by_name (handle, "adf-mode", out index);
+
+            /* Support Canon DR-C240 ADF_BOTH options */
+            if (option == null)
+                option = get_option_by_name (handle, "ScanMode", out index);
             if (option != null)
             {
                 string[] adf_simplex_modes =


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]