Merge commit 'upstream/1.0.2'

5 files changed, 18 insertions, 7 deletions

diff --git a/NEWS b/NEWS
index f273dfc..00cd43d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Overview of changes in simple-scan 1.0.2
+
+ * Fix crash setting automatic source on some drivers 
+
+Overview of changes in simple-scan 1.0.1
+
+ * Remove uninitialized g_object_unref
+
 Overview of changes in simple-scan 1.0.0
 
  * Don't put dashes in temporary filenames used when emailing to workaround a
diff --git a/configure b/configure
index 7fb4a4f..66dddd3 100755
--- a/configure
+++ b/configure
@@ -2662,7 +2662,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=simple-scan
- VERSION=1.0.0
+ VERSION=1.0.2
 
 
 cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index 8a38230..82c11c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(configure.ac)
-AM_INIT_AUTOMAKE(simple-scan, 1.0.0)
+AM_INIT_AUTOMAKE(simple-scan, 1.0.2)
 AM_MAINTAINER_MODE
 GNOME_MAINTAINER_MODE_DEFINES
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
diff --git a/src/book.c b/src/book.c
index 036d133..8493c84 100644
--- a/src/book.c
+++ b/src/book.c
@@ -328,11 +328,8 @@ book_save_pdf_with_imagemagick (Book *book, GFile *file, GError **error)
     }
 
     /* Move to target URI */
-    if (result) {
-        GFile *dest;
+    if (result)
         result = g_file_move (output_file, file, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, error);
-        g_object_unref (dest);
-    }
   
     /* Delete page files */
     for (link = temporary_files; link; link = link->next) {
diff --git a/src/scanner.c b/src/scanner.c
index 9181868..b27ae2a 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -457,6 +457,10 @@ set_default_option (SANE_Handle handle, const SANE_Option_Descriptor *option, SA
 {
     SANE_Status status;
 
+    /* Check if supports automatic option */
+    if ((option->cap & SANE_CAP_AUTOMATIC) == 0)
+        return FALSE;
+
     status = sane_control_option (handle, option_index, SANE_ACTION_SET_AUTO, NULL, NULL);
     g_debug ("sane_control_option (%d, SANE_ACTION_SET_AUTO) -> %s",
              option_index, get_status_string (status));
@@ -880,7 +884,7 @@ do_open (Scanner *scanner)
 
     if (!job->device) {
         g_warning ("No scan device available");
-        fail_scan (scanner, status,
+        fail_scan (scanner, 0,
                    /* Error displayed when no scanners to scan with */
                    _("No scanners available.  Please connect a scanner."));
         return;
@@ -986,6 +990,8 @@ do_get_option (Scanner *scanner)
     else if (strcmp (option->name, SANE_NAME_SCAN_SOURCE) == 0) {
         const char *flatbed_sources[] =
         {
+            "Auto",
+            SANE_I18N ("Auto"),
             "Flatbed",
             SANE_I18N ("Flatbed"),
             "FlatBed",