summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlessio Treglia <quadrispro@ubuntu.com>2010-04-16 10:03:39 +0200
committerAlessio Treglia <quadrispro@ubuntu.com>2010-04-16 10:03:39 +0200
commit279b3fab7a8fcee6ed831447b37e1ac5d0397d44 (patch)
tree8063b9cf696835ff810f18f9ec6c8539aaf90a7b /src
parent6d9871f7c7de6caca9eb78683bcba499119e1469 (diff)
Imported Upstream version 1.0.2upstream/1.0.2
Diffstat (limited to 'src')
-rw-r--r--src/book.c5
-rw-r--r--src/scanner.c8
2 files changed, 8 insertions, 5 deletions
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",