Imported Upstream version 3.20.0upstream/3.20.0

author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2016-03-27 10:25:50 +0200
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2016-03-27 10:25:50 +0200
commit: 3d4577b0ff453500f7ee52e539a6c2f6fc3faac7 (patch)
tree: c3311dea5430a6872213146b4c710542cca681da
parent: 59c8c1046c1b17411232821ff892febf42cb82e6 (diff)
29 files changed, 4711 insertions, 4573 deletions
diff --git a/Makefile.in b/Makefile.in
index eb5a76e..b860440 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -156,7 +156,7 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in COPYING NEWS compile depcomp \
+am__DIST_COMMON = $(srcdir)/Makefile.in COPYING NEWS compile \
 	install-sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
diff --git a/NEWS b/NEWS
index 079bc56..f12ea3b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Overview of changes in simple-scan 3.20.0
+
+  * Fix window state saving with client side decorations
+
+Overview of changes in simple-scan 3.19.92
+
+  * Updated translations
+
+Overview of changes in simple-scan 3.19.91
+
+  * Updated translations
+
 Overview of changes in simple-scan 3.19.90
 
   * Updated translations
diff --git a/configure b/configure
index d9627cc..158345a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for simple-scan 3.19.90.
+# Generated by GNU Autoconf 2.69 for simple-scan 3.20.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -637,8 +637,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='simple-scan'
 PACKAGE_TARNAME='simple-scan'
-PACKAGE_VERSION='3.19.90'
-PACKAGE_STRING='simple-scan 3.19.90'
+PACKAGE_VERSION='3.20.0'
+PACKAGE_STRING='simple-scan 3.20.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1415,7 +1415,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures simple-scan 3.19.90 to adapt to many kinds of systems.
+\`configure' configures simple-scan 3.20.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1482,7 +1482,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of simple-scan 3.19.90:";;
+     short | recursive ) echo "Configuration of simple-scan 3.20.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1604,7 +1604,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-simple-scan configure 3.19.90
+simple-scan configure 3.20.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1856,7 +1856,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by simple-scan $as_me 3.19.90, which was
+It was created by simple-scan $as_me 3.20.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2719,7 +2719,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='simple-scan'
- VERSION='3.19.90'
+ VERSION='3.20.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6527,7 +6527,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by simple-scan $as_me 3.19.90, which was
+This file was extended by simple-scan $as_me 3.20.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6584,7 +6584,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-simple-scan config.status 3.19.90
+simple-scan config.status 3.20.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 1219cfe..ca50b0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(simple-scan, 3.19.90)
+AC_INIT(simple-scan, 3.20.0)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
diff --git a/data/simple-scan.ui b/data/simple-scan.ui
index d610c2e..2c6e7ba 100644
--- a/data/simple-scan.ui
+++ b/data/simple-scan.ui
@@ -224,9 +224,7 @@
     <property name="can_focus">False</property>
     <property name="title" translatable="yes" comments="Title of scan window">Simple Scan</property>
     <property name="icon_name">scanner</property>
-    <signal name="configure-event" handler="simple_scan_window_configure_event_cb" swapped="no"/>
     <signal name="delete-event" handler="window_delete_event_cb" swapped="no"/>
-    <signal name="window-state-event" handler="simple_scan_window_window_state_event_cb" swapped="no"/>
     <child>
       <object class="GtkBox" id="main_vbox">
         <property name="visible">True</property>
diff --git a/help/sk/sk.po b/help/sk/sk.po
index fd29b54..e8d7b49 100644
--- a/help/sk/sk.po
+++ b/help/sk/sk.po
@@ -9,14 +9,14 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-04-17 16:01+1000\n"
-"PO-Revision-Date: 2015-08-25 21:01+0000\n"
+"PO-Revision-Date: 2016-03-12 15:09+0000\n"
 "Last-Translator: Dusan Kazik <prescott66@gmail.com>\n"
 "Language-Team: slovenčina <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-12-22 04:39+0000\n"
-"X-Generator: Launchpad (build 17865)\n"
+"X-Launchpad-Export-Date: 2016-03-13 05:25+0000\n"
+"X-Generator: Launchpad (build 17939)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -79,6 +79,8 @@ msgid ""
 "The crop area can be adjusted by clicking on the inside of the crop area "
 "border and dragging the mouse."
 msgstr ""
+"Oblasť orezania môže byť upravená kliknutím v hranici oblasti orezania a "
+"potiahnutím myši."
 
 #: C/crop.page:18(page/p)
 msgid ""
@@ -89,7 +91,7 @@ msgstr ""
 
 #: C/crop.page:21(page/p)
 msgid "Each new page that is scanned will use the previous crop."
-msgstr ""
+msgstr "Každá nová oskenovaná stránka použije predchádzajúce orezanie."
 
 #: C/dpi.page:9(page/title)
 msgid "Setting the Scan Resolution"
diff --git a/help/zh_TW/adf.page b/help/zh_TW/adf.page
index 36fc104..3632181 100644
--- a/help/zh_TW/adf.page
+++ b/help/zh_TW/adf.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#acquire"/>
     </info>
 
-	<title>Using an Automatic Document Feeder</title>
+	<title>使用自動送紙器</title>
 
     <p>
     If your scanner features an Automatic Document Feeder (ADF) 
diff --git a/help/zh_TW/dpi.page b/help/zh_TW/dpi.page
index f127718..9523675 100644
--- a/help/zh_TW/dpi.page
+++ b/help/zh_TW/dpi.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#acquire"/>
     </info>
   
-	<title>Setting the Scan Resolution</title>
+	<title>設定掃描解析度</title>
 
     <p>
     The default resolution for document type <gui><em>Text</em></gui> is 150 dpi (dots per inch)
diff --git a/help/zh_TW/email.page b/help/zh_TW/email.page
index 54ee14e..e5e078d 100644
--- a/help/zh_TW/email.page
+++ b/help/zh_TW/email.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#use"/>
     </info>
   
-	<title>Sending via Email</title>
+	<title>以電子郵件傳送</title>
 
     <p>
     To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq>
@@ -17,7 +17,5 @@
     Conversely, if the document type was set to "Photo", the email will have a JPEG
     attachment for each page.    
     </p>
-    <p>
-    See <link xref="save"/> for more information about file formats.
-    </p>
+    <p>有關檔案格式的更多資訊，請見 <link xref="save"/>。</p>
 </page>
diff --git a/help/zh_TW/index.page b/help/zh_TW/index.page
index b8fb100..3c902aa 100644
--- a/help/zh_TW/index.page
+++ b/help/zh_TW/index.page
@@ -16,15 +16,15 @@
 	<title><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
     
     <section id="acquire" style="2column">
-        <title>Scanning Pages</title>
+        <title>掃描頁面</title>
     </section>
 
     <section id="modify" style="2column">
-        <title>Modifying the Document</title>
+        <title>修改文年</title>
     </section>
 
     <section id="use" style="2column">
-        <title>Using the Document</title>
+        <title>使用文件</title>
     </section>
 
     <section id="shortcuts" style="2column">
diff --git a/help/zh_TW/reorder.page b/help/zh_TW/reorder.page
index 936efae..99c4bc6 100644
--- a/help/zh_TW/reorder.page
+++ b/help/zh_TW/reorder.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#modify"/>
     </info>
   
-	<title>Reordering Pages</title>
+	<title>為頁面重新排序</title>
 
     <p>
     To move a page, right click on it and choose <gui><em>Move Left</em></gui> or 
diff --git a/help/zh_TW/save.page b/help/zh_TW/save.page
index b40085e..6d2dfd2 100644
--- a/help/zh_TW/save.page
+++ b/help/zh_TW/save.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#use"/>
     </info>
   
-	<title>Saving to a File</title>
+	<title>儲存至檔案</title>
 
     <steps>
       <item>
diff --git a/help/zh_TW/scanner.page b/help/zh_TW/scanner.page
index 424dfc3..0dfc083 100644
--- a/help/zh_TW/scanner.page
+++ b/help/zh_TW/scanner.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#acquire"/>
     </info>
   
-	<title>Selecting a Scanner</title>
+	<title>選取掃描器</title>
 
     <p>
     If you have multiple scanning devices you can change the selected device from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
diff --git a/help/zh_TW/scanning.page b/help/zh_TW/scanning.page
index c1d0d28..ad1c811 100644
--- a/help/zh_TW/scanning.page
+++ b/help/zh_TW/scanning.page
@@ -6,14 +6,14 @@
         <link type="guide" xref="index#acquire"/>
     </info>
   
-	<title>Scanning a Page</title>
+	<title>掃描頁面</title>
 
     <p>
     To scan a document from your scanner:
     </p>
     <steps>
       <item><p>Connect the scanner to your computer and power it on.</p></item>
-      <item><p>Open <app>Simple Scan</app>.</p></item>
+      <item><p>開啟<app>掃描易</app>。</p></item>
       <item><p>Click the arrow to the right of the "Scan" button and choose the type
 	     of document you are scanning: <em>Photo</em> or <em>Text</em>.</p>
 	     <media type="image" src="figures/scan_toolbar.png"/></item>
diff --git a/help/zh_TW/zh_TW.po b/help/zh_TW/zh_TW.po
index c2bfe55..b13d1cf 100644
--- a/help/zh_TW/zh_TW.po
+++ b/help/zh_TW/zh_TW.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-04-17 16:01+1000\n"
-"PO-Revision-Date: 2012-10-25 09:24+0000\n"
+"PO-Revision-Date: 2016-02-16 05:12+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-12-22 04:39+0000\n"
-"X-Generator: Launchpad (build 17865)\n"
+"X-Launchpad-Export-Date: 2016-02-17 05:14+0000\n"
+"X-Generator: Launchpad (build 17925)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -34,19 +34,19 @@ msgstr ""
 
 #: C/index.page:16(section/title)
 msgid "Scanning Pages"
-msgstr ""
+msgstr "掃描頁面"
 
 #: C/index.page:20(section/title)
 msgid "Modifying the Document"
-msgstr ""
+msgstr "修改文年"
 
 #: C/index.page:24(section/title)
 msgid "Using the Document"
-msgstr ""
+msgstr "使用文件"
 
 #: C/adf.page:9(page/title)
 msgid "Using an Automatic Document Feeder"
-msgstr ""
+msgstr "使用自動送紙器"
 
 #: C/adf.page:11(page/p)
 msgid ""
@@ -92,7 +92,7 @@ msgstr ""
 
 #: C/dpi.page:9(page/title)
 msgid "Setting the Scan Resolution"
-msgstr ""
+msgstr "設定掃描解析度"
 
 #: C/dpi.page:11(page/p)
 msgid ""
@@ -103,7 +103,7 @@ msgstr ""
 
 #: C/email.page:9(page/title)
 msgid "Sending via Email"
-msgstr ""
+msgstr "以電子郵件傳送"
 
 #: C/email.page:11(page/p)
 msgid ""
@@ -121,7 +121,7 @@ msgstr ""
 
 #: C/email.page:18(page/p)
 msgid "See <link xref=\"save\"/> for more information about file formats."
-msgstr ""
+msgstr "有關檔案格式的更多資訊，請見 <link xref=\"save\"/>。"
 
 #: C/legal.xml:4(p/link)
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
@@ -151,7 +151,7 @@ msgstr ""
 
 #: C/reorder.page:9(page/title)
 msgid "Reordering Pages"
-msgstr ""
+msgstr "為頁面重新排序"
 
 #: C/reorder.page:11(page/p)
 msgid ""
@@ -165,7 +165,7 @@ msgstr ""
 
 #: C/rotate.page:9(page/title)
 msgid "Rotating Pages"
-msgstr ""
+msgstr "旋轉頁面"
 
 #: C/rotate.page:11(page/p)
 msgid ""
@@ -176,7 +176,7 @@ msgstr ""
 
 #: C/save.page:9(page/title)
 msgid "Saving to a File"
-msgstr ""
+msgstr "儲存至檔案"
 
 #: C/save.page:11(page/p)
 msgid ""
@@ -234,7 +234,7 @@ msgstr ""
 
 #: C/scanner.page:9(page/title)
 msgid "Selecting a Scanner"
-msgstr ""
+msgstr "選取掃描器"
 
 #: C/scanner.page:11(page/p)
 msgid ""
@@ -257,7 +257,7 @@ msgstr "0"
 
 #: C/scanning.page:10(page/title)
 msgid "Scanning a Page"
-msgstr ""
+msgstr "掃描頁面"
 
 #: C/scanning.page:12(page/p)
 msgid "To scan a document from your scanner:"
@@ -269,13 +269,13 @@ msgstr ""
 
 #: C/scanning.page:22(item/p)
 msgid "Open <app>Simple Scan</app>."
-msgstr ""
+msgstr "開啟<app>掃描易</app>。"
 
 #: C/scanning.page:27(item/p)
 msgid ""
 "Press the scan button in the toolbar (or "
 "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-msgstr ""
+msgstr "按下工具列的「掃描」鍵 (或 <keyseq><key>Ctrl</key><key>1</key></keyseq>)。"
 
 #: C/scanning.page:33(page/p)
 msgid "The page will be shown as it is scanned."
@@ -299,4 +299,4 @@ msgstr ""
 
 #: C/scanning.page:47(page/p)
 msgid "To stop the scan at any time press <key>Escape</key>."
-msgstr ""
+msgstr "任何時候想終止掃描，按 <key>Esc</key>。"
diff --git a/m4/nls.m4 b/m4/nls.m4
index 53cdc8b..93df8d3 100644
--- a/m4/nls.m4
+++ b/m4/nls.m4
@@ -5,13 +5,13 @@ dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:
diff --git a/m4/pkg.m4 b/m4/pkg.m4
index c5b26b5..4688002 100644
--- a/m4/pkg.m4
+++ b/m4/pkg.m4
@@ -1,29 +1,60 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29)
+dnl
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -45,18 +76,19 @@ if test -n "$PKG_CONFIG"; then
 		PKG_CONFIG=""
 	fi
 fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+])dnl PKG_PROG_PKG_CONFIG
+
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
@@ -66,8 +98,10 @@ m4_ifvaln([$3], [else
   $3])dnl
 fi])
 
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
 m4_define([_PKG_CONFIG],
 [if test -n "$$1"; then
     pkg_cv_[]$1="$$1"
@@ -79,10 +113,11 @@ m4_define([_PKG_CONFIG],
  else
     pkg_failed=untried
 fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
 
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -90,19 +125,17 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 else
         _pkg_short_errors_supported=no
 fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
+
+
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
 AC_DEFUN([PKG_CHECK_MODULES],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
@@ -156,16 +189,40 @@ else
         AC_MSG_RESULT([yes])
 	$3
 fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
 
 
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
 AC_DEFUN([PKG_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -176,16 +233,18 @@ AC_ARG_WITH([pkgconfigdir],
 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
+])dnl PKG_INSTALLDIR
 
 
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
 AC_DEFUN([PKG_NOARCH_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -196,13 +255,15 @@ AC_ARG_WITH([noarch-pkgconfigdir],
 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
+])dnl PKG_NOARCH_INSTALLDIR
 
 
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
 AC_DEFUN([PKG_CHECK_VAR],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
@@ -211,4 +272,4 @@ _PKG_CONFIG([$1], [variable="][$3]["], [$2])
 AS_VAR_COPY([$1], [pkg_cv_][$1])
 
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
+])dnl PKG_CHECK_VAR
diff --git a/po/eu.po b/po/eu.po
index ca57ac9..95ec0cf 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2015-11-27 09:10+1300\n"
-"PO-Revision-Date: 2014-03-11 21:02+0000\n"
+"PO-Revision-Date: 2016-02-18 19:51+0000\n"
 "Last-Translator: Asier Sarasua Garmendia <Unknown>\n"
 "Language-Team: Basque <eu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-12-22 04:38+0000\n"
-"X-Generator: Launchpad (build 17865)\n"
+"X-Launchpad-Export-Date: 2016-02-19 05:14+0000\n"
+"X-Generator: Launchpad (build 17925)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -294,7 +294,7 @@ msgstr "Kalitatea:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr ""
+msgstr "Dokumentuen eskanerra"
 
 #: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
@@ -494,7 +494,7 @@ msgstr "Egiaztatu zure eskanerra konektatuta eta piztuta dagoela"
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
 #: ../src/ui.vala:381
 msgid "Additional software needed"
-msgstr ""
+msgstr "Software gehiago behar da"
 
 #. Instructions to install driver software
 #: ../src/ui.vala:383
@@ -547,7 +547,7 @@ msgstr "PNG (galerarik gabea)"
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
 #: ../src/ui.vala:556
 msgid "File format:"
-msgstr ""
+msgstr "Fitxategi-formatua:"
 
 #. Title of error dialog when save failed
 #: ../src/ui.vala:649
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ce8320b..ce985fb 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2015-11-27 09:10+1300\n"
-"PO-Revision-Date: 2012-10-25 09:21+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
+"PO-Revision-Date: 2016-02-14 11:17+0000\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-12-22 04:39+0000\n"
-"X-Generator: Launchpad (build 17865)\n"
+"X-Launchpad-Export-Date: 2016-02-15 05:16+0000\n"
+"X-Generator: Launchpad (build 17925)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -693,7 +693,7 @@ msgstr "您似乎有一台 Epson 掃描器。"
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
-msgstr ""
+msgstr "此裝置的驅動程式可以在 <a href=\"http://support.epson.com\">Epson 網站</a> 上找到。"
 
 #. Title of dialog giving instructions on how to install drivers
 #: ../src/ui.vala:1603
diff --git a/src/autosave-manager.c b/src/autosave-manager.c
index 779f501..044761e 100644
--- a/src/autosave-manager.c
+++ b/src/autosave-manager.c
@@ -1,4 +1,4 @@
-/* autosave-manager.c generated by valac 0.30.0, the Vala compiler
+/* autosave-manager.c generated by valac 0.30.1, the Vala compiler
  * generated from autosave-manager.vala, do not modify */
 
 /*
diff --git a/src/book-view.c b/src/book-view.c
index 94d1929..16176a5 100644
--- a/src/book-view.c
+++ b/src/book-view.c
@@ -1,4 +1,4 @@
-/* book-view.c generated by valac 0.30.0, the Vala compiler
+/* book-view.c generated by valac 0.30.1, the Vala compiler
  * generated from book-view.vala, do not modify */
 
 /*
diff --git a/src/book.c b/src/book.c
index 56cbb93..5811cd0 100644
--- a/src/book.c
+++ b/src/book.c
@@ -1,4 +1,4 @@
-/* book.c generated by valac 0.30.0, the Vala compiler
+/* book.c generated by valac 0.30.1, the Vala compiler
  * generated from book.vala, do not modify */
 
 /*
diff --git a/src/page-view.c b/src/page-view.c
index c8d7cbb..7489ed0 100644
--- a/src/page-view.c
+++ b/src/page-view.c
@@ -1,4 +1,4 @@
-/* page-view.c generated by valac 0.30.0, the Vala compiler
+/* page-view.c generated by valac 0.30.1, the Vala compiler
  * generated from page-view.vala, do not modify */
 
 /*
diff --git a/src/page.c b/src/page.c
index cbc0141..bb536b1 100644
--- a/src/page.c
+++ b/src/page.c
@@ -1,4 +1,4 @@
-/* page.c generated by valac 0.30.0, the Vala compiler
+/* page.c generated by valac 0.30.1, the Vala compiler
  * generated from page.vala, do not modify */
 
 /*
diff --git a/src/resources.c b/src/resources.c
index dac0374..e7147d9 100644
--- a/src/resources.c
+++ b/src/resources.c
@@ -6,7 +6,7 @@
 # define SECTION
 #endif
 
-static const SECTION union { const guint8 data[50751]; const double alignment; void * const ptr;}  simple_scan_resource_data = { {
+static const SECTION union { const guint8 data[50559]; const double alignment; void * const ptr;}  simple_scan_resource_data = { {
   0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
   0x18, 0x00, 0x00, 0x00, 0xac, 0x00, 0x00, 0x00, 
@@ -28,7 +28,7 @@ static const SECTION union { const guint8 data[50751]; const double alignment; v
   0xd8, 0x00, 0x00, 0x00, 0x76, 0x8d, 0xc8, 0xbd, 
   0x02, 0x00, 0x00, 0x00, 0xd8, 0x00, 0x00, 0x00, 
   0x0e, 0x00, 0x76, 0x00, 0xe8, 0x00, 0x00, 0x00, 
-  0x3f, 0xc6, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, 
+  0x7f, 0xc5, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, 
   0x01, 0x00, 0x00, 0x00, 0x6f, 0x72, 0x67, 0x2f, 
   0x03, 0x00, 0x00, 0x00, 0x53, 0x69, 0x6d, 0x70, 
   0x6c, 0x65, 0x53, 0x63, 0x61, 0x6e, 0x2f, 0x00, 
@@ -36,7 +36,7 @@ static const SECTION union { const guint8 data[50751]; const double alignment; v
   0x65, 0x2f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
   0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x2d, 0x73, 
   0x63, 0x61, 0x6e, 0x2e, 0x75, 0x69, 0x00, 0x00, 
-  0x47, 0xc5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x87, 0xc4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
   0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 
   0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 
   0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, 
@@ -940,35 +940,11 @@ static const SECTION union { const guint8 data[50751]; const double alignment; v
   0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
   0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 
-  0x75, 0x72, 0x65, 0x2d, 0x65, 0x76, 0x65, 0x6e, 
-  0x74, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
-  0x65, 0x72, 0x3d, 0x22, 0x73, 0x69, 0x6d, 0x70, 
-  0x6c, 0x65, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 
-  0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x63, 
-  0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 
-  0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x63, 
-  0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
-  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
-  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 
-  0x65, 0x6c, 0x65, 0x74, 0x65, 0x2d, 0x65, 0x76, 
-  0x65, 0x6e, 0x74, 0x22, 0x20, 0x68, 0x61, 0x6e, 
-  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x77, 0x69, 
-  0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x64, 0x65, 0x6c, 
-  0x65, 0x74, 0x65, 0x5f, 0x65, 0x76, 0x65, 0x6e, 
-  0x74, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
-  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
-  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
-  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 
-  0x2d, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2d, 0x65, 
-  0x76, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x68, 0x61, 
-  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 
-  0x69, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x73, 0x63, 
-  0x61, 0x6e, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 
-  0x77, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 
-  0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x65, 
+  0x3d, 0x22, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 
+  0x2d, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 
+  0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x5f, 0x65, 
   0x76, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x62, 0x22, 
   0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
   0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
@@ -6391,17 +6367,43 @@ GResource *simple_scan_get_resource (void)
 
 #define G_HAS_CONSTRUCTORS 1
 
-#define G_DEFINE_CONSTRUCTOR(_func) \
+/* We do some weird things to avoid the constructors being optimized
+ * away on VS2015 if WholeProgramOptimization is enabled. First we
+ * make a reference to the array from the wrapper to make sure its
+ * references. Then we use a pragma to make sure the wrapper function
+ * symbol is always included at the link stage. Also, the symbols
+ * need to be extern (but not dllexport), even though they are not
+ * really used from another object file.
+ */
+
+/* We need to account for differences between the mangling of symbols
+ * for Win32 (x86) and x64 programs, as symbols on Win32 are prefixed
+ * with an underscore but symbols on x64 are not.
+ */
+#ifdef _WIN64
+#define G_MSVC_SYMBOL_PREFIX ""
+#else
+#define G_MSVC_SYMBOL_PREFIX "_"
+#endif
+
+#define G_DEFINE_CONSTRUCTOR(_func) G_MSVC_CTOR (_func, G_MSVC_SYMBOL_PREFIX)
+#define G_DEFINE_DESTRUCTOR(_func) G_MSVC_DTOR (_func, G_MSVC_SYMBOL_PREFIX)
+
+#define G_MSVC_CTOR(_func,_sym_prefix) \
   static void _func(void); \
-  static int _func ## _wrapper(void) { _func(); return 0; } \
+  extern int (* _array ## _func)(void);              \
+  int _func ## _wrapper(void) { _func(); g_slist_find (NULL,  _array ## _func); return 0; } \
+  __pragma(comment(linker,"/include:" _sym_prefix # _func "_wrapper")) \
   __pragma(section(".CRT$XCU",read)) \
-  __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _wrapper;
+  __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _wrapper;
 
-#define G_DEFINE_DESTRUCTOR(_func) \
+#define G_MSVC_DTOR(_func,_sym_prefix) \
   static void _func(void); \
-  static int _func ## _constructor(void) { atexit (_func); return 0; } \
+  extern int (* _array ## _func)(void);              \
+  int _func ## _constructor(void) { atexit (_func); g_slist_find (NULL,  _array ## _func); return 0; } \
+   __pragma(comment(linker,"/include:" _sym_prefix # _func "_constructor")) \
   __pragma(section(".CRT$XCU",read)) \
-  __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor;
+  __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _constructor;
 
 #elif defined (_MSC_VER)
 
diff --git a/src/scanner.c b/src/scanner.c
index 8c8f493..1db0c10 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -1,4 +1,4 @@
-/* scanner.c generated by valac 0.30.0, the Vala compiler
+/* scanner.c generated by valac 0.30.1, the Vala compiler
  * generated from scanner.vala, do not modify */
 
 /*
diff --git a/src/simple-scan.c b/src/simple-scan.c
index 07f8d96..1e0d4a4 100644
--- a/src/simple-scan.c
+++ b/src/simple-scan.c
@@ -1,4 +1,4 @@
-/* simple-scan.c generated by valac 0.30.0, the Vala compiler
+/* simple-scan.c generated by valac 0.30.1, the Vala compiler
  * generated from simple-scan.vala, do not modify */
 
 /*
@@ -973,13 +973,13 @@ static void _g_free0_ (gpointer var) {
 static gint g_ptr_array_get_length (GPtrArray* self) {
 	gint result;
 	guint _tmp0_ = 0U;
-#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	_tmp0_ = self->len;
-#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	result = (gint) _tmp0_;
-#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	return result;
 #line 985 "simple-scan.c"
 }
@@ -987,11 +987,11 @@ static gint g_ptr_array_get_length (GPtrArray* self) {
 
 static void g_ptr_array_set_length (GPtrArray* self, gint value) {
 	gint _tmp0_ = 0;
-#line 4443 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4453 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	g_return_if_fail (self != NULL);
-#line 4443 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4453 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	_tmp0_ = value;
-#line 4443 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4453 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	g_ptr_array_set_size (self, _tmp0_);
 #line 997 "simple-scan.c"
 }
diff --git a/src/ui.c b/src/ui.c
index 18d7451..0a3fdaa 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1,4 +1,4 @@
-/* ui.c generated by valac 0.30.0, the Vala compiler
+/* ui.c generated by valac 0.30.1, the Vala compiler
  * generated from ui.vala, do not modify */
 
 /*
@@ -247,6 +247,7 @@ struct _UserInterfacePrivate {
 	gint window_width;
 	gint window_height;
 	gboolean window_is_maximized;
+	gboolean window_is_fullscreen;
 	guint save_state_timeout;
 };
 
@@ -686,8 +687,7 @@ static void user_interface_save_state (UserInterface* self, gboolean force);
 void autosave_manager_cleanup (AutosaveManager* self);
 static void user_interface_quit_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
 static void _user_interface_quit_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static gboolean user_interface_simple_scan_window_configure_event_cb (UserInterface* self, GtkWidget* widget, GdkEventConfigure* event);
-static gboolean _user_interface_simple_scan_window_configure_event_cb_gtk_widget_configure_event (GtkWidget* _sender, GdkEventConfigure* event, gpointer self);
+static void user_interface_real_size_allocate (GtkWidget* base, GtkAllocation* allocation);
 static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar* widget, gint response_id);
 static void user_interface_install_drivers (UserInterface* self);
 static Block3Data* block3_data_ref (Block3Data* _data3_);
@@ -701,8 +701,7 @@ static void ____lambda13__gasync_ready_callback (GObject* source_object, GAsyncR
 static void user_interface_install_packages_data_free (gpointer _data);
 static gboolean user_interface_install_packages_co (UserInterfaceInstallPackagesData* _data_);
 static void user_interface_install_packages_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_);
-static gboolean user_interface_simple_scan_window_window_state_event_cb (UserInterface* self, GtkWidget* widget, GdkEventWindowState* event);
-static gboolean _user_interface_simple_scan_window_window_state_event_cb_gtk_widget_window_state_event (GtkWidget* _sender, GdkEventWindowState* event, gpointer self);
+static gboolean user_interface_real_window_state_event (GtkWidget* base, GdkEventWindowState* event);
 static gboolean user_interface_window_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event);
 static gboolean _user_interface_window_delete_event_cb_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
 static void user_interface_page_size_changed_cb (UserInterface* self, Page* page);
@@ -789,100 +788,100 @@ static gint _vala_array_length (gpointer array);
 static const GActionEntry USER_INTERFACE_action_entries[10] = {{"new_document", _user_interface_new_document_activate_cb_gsimple_action_activate_callback}, {"reorder", _user_interface_reorder_document_activate_cb_gsimple_action_activate_callback}, {"save", _user_interface_save_document_activate_cb_gsimple_action_activate_callback}, {"save_as", _user_interface_save_as_document_activate_cb_gsimple_action_activate_callback}, {"email", _user_interface_email_document_activate_cb_gsimple_action_activate_callback}, {"print", _user_interface_print_document_activate_cb_gsimple_action_activate_callback}, {"preferences", _user_interface_preferences_activate_cb_gsimple_action_activate_callback}, {"help", _user_interface_help_contents_activate_cb_gsimple_action_activate_callback}, {"about", _user_interface_about_activate_cb_gsimple_action_activate_callback}, {"quit", _user_interface_quit_activate_cb_gsimple_action_activate_callback}};
 
 static void _user_interface_page_added_cb_book_page_added (Book* _sender, Page* page, gpointer self) {
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_added_cb ((UserInterface*) self, _sender, page);
-#line 795 "ui.c"
+#line 794 "ui.c"
 }
 
 
 static void _user_interface_reordered_cb_book_reordered (Book* _sender, gpointer self) {
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reordered_cb ((UserInterface*) self, _sender);
-#line 802 "ui.c"
+#line 801 "ui.c"
 }
 
 
 static void _user_interface_page_removed_cb_book_page_removed (Book* _sender, Page* page, gpointer self) {
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_removed_cb ((UserInterface*) self, _sender, page);
-#line 809 "ui.c"
+#line 808 "ui.c"
 }
 
 
 static void _user_interface_new_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document_activate_cb ((UserInterface*) self);
-#line 816 "ui.c"
+#line 815 "ui.c"
 }
 
 
 static void _user_interface_reorder_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_document_activate_cb ((UserInterface*) self);
-#line 823 "ui.c"
+#line 822 "ui.c"
 }
 
 
 static void _user_interface_save_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document_activate_cb ((UserInterface*) self);
-#line 830 "ui.c"
+#line 829 "ui.c"
 }
 
 
 static void _user_interface_save_as_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_as_document_activate_cb ((UserInterface*) self);
-#line 837 "ui.c"
+#line 836 "ui.c"
 }
 
 
 static void _user_interface_email_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_email_document_activate_cb ((UserInterface*) self);
-#line 844 "ui.c"
+#line 843 "ui.c"
 }
 
 
 static void _user_interface_print_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document_activate_cb ((UserInterface*) self);
-#line 851 "ui.c"
+#line 850 "ui.c"
 }
 
 
 static void _user_interface_preferences_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_preferences_activate_cb ((UserInterface*) self);
-#line 858 "ui.c"
+#line 857 "ui.c"
 }
 
 
 static void _user_interface_help_contents_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_help_contents_activate_cb ((UserInterface*) self);
-#line 865 "ui.c"
+#line 864 "ui.c"
 }
 
 
 static void _user_interface_about_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_about_activate_cb ((UserInterface*) self);
-#line 872 "ui.c"
+#line 871 "ui.c"
 }
 
 
 static void _user_interface_quit_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_quit_activate_cb ((UserInterface*) self);
-#line 879 "ui.c"
+#line 878 "ui.c"
 }
 
 
 static void _user_interface_needs_saving_cb_book_needs_saving_changed (Book* _sender, gpointer self) {
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_needs_saving_cb ((UserInterface*) self, _sender);
-#line 886 "ui.c"
+#line 885 "ui.c"
 }
 
 
@@ -902,102 +901,102 @@ UserInterface* user_interface_construct (GType object_type) {
 	Book* _tmp11_ = NULL;
 	guint _tmp12_ = 0U;
 	guint _tmp13_ = 0U;
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (UserInterface*) g_object_new (object_type, NULL);
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_settings_new ("org.gnome.SimpleScan");
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->settings);
-#line 262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->settings = _tmp0_;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_new ();
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_book (self, _tmp2_);
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_book_unref0 (_tmp2_);
 #line 265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_book_unref0 (_tmp2_);
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->_book;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp3_, "page-added", (GCallback) _user_interface_page_added_cb_book_page_added, self, 0);
 #line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp3_, "page-added", (GCallback) _user_interface_page_added_cb_book_page_added, self, 0);
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->_book;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp4_, "reordered", (GCallback) _user_interface_reordered_cb_book_reordered, self, 0);
 #line 267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp4_, "reordered", (GCallback) _user_interface_reordered_cb_book_reordered, self, 0);
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->_book;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp5_, "page-removed", (GCallback) _user_interface_page_removed_cb_book_page_removed, self, 0);
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp5_, "page-removed", (GCallback) _user_interface_page_removed_cb_book_page_removed, self, 0);
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->_book;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp6_, "needs-saving-changed", (GCallback) _user_interface_needs_saving_cb_book_needs_saving_changed, self, 0);
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_load (self);
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = autosave_manager_new ();
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_autosave_manager_unref0 (self->priv->autosave_manager);
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->autosave_manager = _tmp7_;
 #line 273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->autosave_manager = _tmp7_;
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->autosave_manager;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->_book;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	autosave_manager_set_book (_tmp8_, _tmp9_);
 #line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	autosave_manager_set_book (_tmp8_, _tmp9_);
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = self->priv->autosave_manager;
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	autosave_manager_load (_tmp10_);
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = self->priv->_book;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = book_get_n_pages (_tmp11_);
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = _tmp12_;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp13_ == ((guint) 0)) {
-#line 964 "ui.c"
+#line 963 "ui.c"
 		Book* _tmp14_ = NULL;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_add_default_page (self);
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_add_default_page (self);
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = self->priv->_book;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_set_needs_saving (_tmp14_, FALSE);
-#line 972 "ui.c"
+#line 971 "ui.c"
 	} else {
 		BookView* _tmp15_ = NULL;
 		Book* _tmp16_ = NULL;
 		Page* _tmp17_ = NULL;
 		Page* _tmp18_ = NULL;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = self->priv->book_view;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = self->priv->_book;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = book_get_page (_tmp16_, 0);
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp18_ = _tmp17_;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_view_set_selected_page (_tmp15_, _tmp18_);
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (_tmp18_);
-#line 990 "ui.c"
+#line 989 "ui.c"
 	}
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 994 "ui.c"
+#line 993 "ui.c"
 }
 
 
 UserInterface* user_interface_new (void) {
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return user_interface_construct (TYPE_USER_INTERFACE);
-#line 1001 "ui.c"
+#line 1000 "ui.c"
 }
 
 
@@ -1008,99 +1007,99 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 	GtkListStore* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (device != NULL, FALSE);
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	have_iter = FALSE;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->device_model;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_iter = _tmp1_;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1026 "ui.c"
+#line 1025 "ui.c"
 		{
 			gboolean _tmp3_ = FALSE;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = TRUE;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 1033 "ui.c"
+#line 1032 "ui.c"
 				gchar* d = NULL;
 				GtkListStore* _tmp8_ = NULL;
 				GtkTreeIter _tmp9_ = {0};
 				const gchar* _tmp10_ = NULL;
 				const gchar* _tmp11_ = NULL;
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp3_) {
-#line 1041 "ui.c"
+#line 1040 "ui.c"
 					gboolean _tmp4_ = FALSE;
 					gboolean _tmp5_ = FALSE;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp5_ = have_iter;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp5_) {
-#line 1048 "ui.c"
+#line 1047 "ui.c"
 						GtkListStore* _tmp6_ = NULL;
 						gboolean _tmp7_ = FALSE;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp6_ = self->priv->device_model;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp7_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp6_, &_vala_iter);
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp4_ = _tmp7_;
-#line 1057 "ui.c"
+#line 1056 "ui.c"
 					} else {
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp4_ = FALSE;
-#line 1061 "ui.c"
+#line 1060 "ui.c"
 					}
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp4_) {
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 1067 "ui.c"
+#line 1066 "ui.c"
 					}
 				}
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp3_ = FALSE;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = self->priv->device_model;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = _vala_iter;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				gtk_tree_model_get ((GtkTreeModel*) _tmp8_, &_tmp9_, 0, &d, -1, -1);
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				gtk_tree_model_get ((GtkTreeModel*) _tmp8_, &_tmp9_, 0, &d, -1, -1);
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp10_ = d;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp11_ = device;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (g_strcmp0 (_tmp10_, _tmp11_) == 0) {
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (g_strcmp0 (_tmp10_, _tmp11_) == 0) {
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					have_iter = TRUE;
-#line 1086 "ui.c"
+#line 1085 "ui.c"
 				}
-#line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (d);
-#line 1090 "ui.c"
+#line 1089 "ui.c"
 			}
 		}
 	}
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = have_iter;
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (iter) {
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*iter = _vala_iter;
-#line 1100 "ui.c"
+#line 1099 "ui.c"
 	}
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 1104 "ui.c"
+#line 1103 "ui.c"
 }
 
 
@@ -1110,35 +1109,35 @@ static void user_interface_show_error_dialog (UserInterface* self, const gchar*
 	GtkMessageDialog* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_title != NULL);
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_text != NULL);
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = error_title;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp0_);
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp1_);
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dialog = _tmp1_;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _ ("_Close");
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_add_button ((GtkDialog*) dialog, _tmp2_, 0);
 #line 318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_dialog_add_button ((GtkDialog*) dialog, _tmp2_, 0);
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = error_text;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_message_dialog_format_secondary_text (dialog, "%s", _tmp3_);
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_run ((GtkDialog*) dialog);
+	gtk_message_dialog_format_secondary_text (dialog, "%s", _tmp3_);
 #line 320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_dialog_run ((GtkDialog*) dialog);
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) dialog);
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
-#line 1142 "ui.c"
+#line 1141 "ui.c"
 }
 
 
@@ -1163,87 +1162,87 @@ void user_interface_authorize (UserInterface* self, const gchar* resource, gchar
 	const gchar* _tmp14_ = NULL;
 	const gchar* _tmp15_ = NULL;
 	gchar* _tmp16_ = NULL;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (resource != NULL);
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Username and password required to access '%s'");
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = resource;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	description = _tmp2_;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->username_entry;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_entry_set_text (_tmp3_, "");
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_entry_set_text (_tmp3_, "");
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->password_entry;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_entry_set_text (_tmp4_, "");
 #line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_entry_set_text (_tmp4_, "");
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->authorize_label;
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_text (_tmp5_, description);
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->authorize_dialog;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp6_, TRUE);
 #line 333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp6_, TRUE);
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = self->priv->authorize_dialog;
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_run (_tmp7_);
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_dialog_run (_tmp7_);
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->authorize_dialog;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp8_, FALSE);
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->username_entry;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = gtk_entry_get_text (_tmp9_);
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = _tmp10_;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = g_strdup (_tmp11_);
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_vala_username);
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_username = _tmp12_;
 #line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_vala_username = _tmp12_;
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->password_entry;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = gtk_entry_get_text (_tmp13_);
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = _tmp14_;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = g_strdup (_tmp15_);
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_vala_password);
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_password = _tmp16_;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (description);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (username) {
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*username = _vala_username;
-#line 1233 "ui.c"
+#line 1232 "ui.c"
 	} else {
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_vala_username);
-#line 1237 "ui.c"
+#line 1236 "ui.c"
 	}
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (password) {
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*password = _vala_password;
-#line 1243 "ui.c"
+#line 1242 "ui.c"
 	} else {
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_vala_password);
-#line 1247 "ui.c"
+#line 1246 "ui.c"
 	}
 }
 
@@ -1254,50 +1253,50 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->setting_devices;
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp0_) {
 #line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp0_) {
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 1268 "ui.c"
+#line 1267 "ui.c"
 	}
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->user_selected_device = TRUE;
 #line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->user_selected_device = TRUE;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_selected_device (self);
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _tmp3_ != NULL;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp3_);
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 1284 "ui.c"
+#line 1283 "ui.c"
 		GSettings* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->settings;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = user_interface_get_selected_device (self);
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _tmp6_;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_settings_set_string (_tmp5_, "selected-device", _tmp8_);
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp8_);
-#line 1301 "ui.c"
+#line 1300 "ui.c"
 	}
 }
 
@@ -1305,7 +1304,7 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg
 static void _user_interface_device_combo_changed_cb_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_device_combo_changed_cb ((UserInterface*) self, _sender);
-#line 1309 "ui.c"
+#line 1308 "ui.c"
 }
 
 
@@ -1335,208 +1334,208 @@ static void user_interface_update_info_bar (UserInterface* self) {
 	GtkButton* _tmp33_ = NULL;
 	gboolean _tmp34_ = FALSE;
 	GtkInfoBar* _tmp35_ = NULL;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	show_close_button = FALSE;
 #line 355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	show_install_button = FALSE;
+	show_close_button = FALSE;
 #line 356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	show_install_button = FALSE;
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	show_change_scanner_button = FALSE;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->have_error;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1351 "ui.c"
+#line 1350 "ui.c"
 		gchar* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		type = GTK_MESSAGE_ERROR;
 #line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		type = GTK_MESSAGE_ERROR;
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = g_strdup ("dialog-error");
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (image_id);
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		image_id = _tmp1_;
 #line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		image_id = _tmp1_;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = self->priv->error_title;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = g_strdup (_tmp2_);
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (title);
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		title = _tmp3_;
 #line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		title = _tmp3_;
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->error_text;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_strdup (_tmp4_);
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (text);
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		text = _tmp5_;
 #line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		show_close_button = TRUE;
+		text = _tmp5_;
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		show_close_button = TRUE;
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = self->priv->error_change_scanner_hint;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		show_change_scanner_button = _tmp6_;
-#line 1388 "ui.c"
+#line 1387 "ui.c"
 	} else {
 		GtkListStore* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = self->priv->device_model;
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = gtk_tree_model_iter_n_children ((GtkTreeModel*) _tmp7_, NULL);
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp8_ == 0) {
-#line 1398 "ui.c"
+#line 1397 "ui.c"
 			gchar* _tmp9_ = NULL;
 			const gchar* _tmp10_ = NULL;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			type = GTK_MESSAGE_WARNING;
 #line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			type = GTK_MESSAGE_WARNING;
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = g_strdup ("dialog-warning");
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (image_id);
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			image_id = _tmp9_;
 #line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			image_id = _tmp9_;
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = self->priv->missing_driver;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp10_ == NULL) {
-#line 1413 "ui.c"
+#line 1412 "ui.c"
 				const gchar* _tmp11_ = NULL;
 				gchar* _tmp12_ = NULL;
 				const gchar* _tmp13_ = NULL;
 				gchar* _tmp14_ = NULL;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp11_ = _ ("No scanners detected");
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = g_strdup (_tmp11_);
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (title);
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				title = _tmp12_;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp13_ = _ ("Please check your scanner is connected and powered on");
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp14_ = g_strdup (_tmp13_);
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (text);
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				text = _tmp14_;
-#line 1434 "ui.c"
+#line 1433 "ui.c"
 			} else {
 				const gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
 				const gchar* _tmp17_ = NULL;
 				gchar* _tmp18_ = NULL;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp15_ = _ ("Additional software needed");
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp16_ = g_strdup (_tmp15_);
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (title);
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				title = _tmp16_;
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp17_ = _ ("You need to install driver software for your scanner.");
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp18_ = g_strdup (_tmp17_);
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (text);
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				text = _tmp18_;
 #line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				text = _tmp18_;
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				show_install_button = TRUE;
-#line 1458 "ui.c"
+#line 1457 "ui.c"
 			}
 		} else {
 			GtkInfoBar* _tmp19_ = NULL;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp19_ = self->priv->info_bar;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_widget_set_visible ((GtkWidget*) _tmp19_, FALSE);
 #line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gtk_widget_set_visible ((GtkWidget*) _tmp19_, FALSE);
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (image_id);
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (text);
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (title);
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return;
-#line 1474 "ui.c"
+#line 1473 "ui.c"
 		}
 	}
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = self->priv->info_bar;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = type;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_info_bar_set_message_type (_tmp20_, _tmp21_);
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_info_bar_set_message_type (_tmp20_, _tmp21_);
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = self->priv->info_bar_image;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = image_id;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_image_set_from_icon_name (_tmp22_, _tmp23_, GTK_ICON_SIZE_DIALOG);
 #line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_image_set_from_icon_name (_tmp22_, _tmp23_, GTK_ICON_SIZE_DIALOG);
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = title;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = text;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = g_strdup_printf ("<big><b>%s</b></big>\n\n%s", _tmp24_, _tmp25_);
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	message = _tmp26_;
 #line 396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	message = _tmp26_;
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = self->priv->info_bar_label;
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = message;
-#line 396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_label_set_markup (_tmp27_, _tmp28_);
 #line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_label_set_markup (_tmp27_, _tmp28_);
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = self->priv->info_bar_close_button;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = show_close_button;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp29_, _tmp30_);
 #line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp29_, _tmp30_);
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = self->priv->info_bar_change_scanner_button;
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = show_change_scanner_button;
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp31_, _tmp32_);
 #line 399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp31_, _tmp32_);
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = self->priv->info_bar_install_button;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp34_ = show_install_button;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp33_, _tmp34_);
 #line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp33_, _tmp34_);
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = self->priv->info_bar;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp35_, TRUE);
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (message);
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (image_id);
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (text);
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (title);
-#line 1533 "ui.c"
+#line 1532 "ui.c"
 }
 
 
 static gpointer _scan_device_ref0 (gpointer self) {
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? scan_device_ref (self) : NULL;
-#line 1540 "ui.c"
+#line 1539 "ui.c"
 }
 
 
@@ -1549,58 +1548,58 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 	gboolean _tmp2_ = FALSE;
 	GList* _tmp6_ = NULL;
 	gboolean _tmp53_ = FALSE;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	have_selection = FALSE;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->setting_devices = TRUE;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = missing_driver;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->missing_driver);
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->missing_driver = _tmp1_;
-#line 414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->user_selected_device;
-#line 414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1571 "ui.c"
+#line 1570 "ui.c"
 		GtkComboBox* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 		gint _tmp5_ = 0;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->device_combo;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = gtk_combo_box_get_active (_tmp3_);
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp4_;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_selection = _tmp5_ >= 0;
-#line 1583 "ui.c"
+#line 1582 "ui.c"
 	}
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	index = 0;
 #line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	index = 0;
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = devices;
-#line 1589 "ui.c"
+#line 1588 "ui.c"
 	{
 		GList* device_collection = NULL;
 		GList* device_it = NULL;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		device_collection = _tmp6_;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
-#line 1597 "ui.c"
+#line 1596 "ui.c"
 			ScanDevice* _tmp7_ = NULL;
 			ScanDevice* device = NULL;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp7_ = _scan_device_ref0 ((ScanDevice*) device_it->data);
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			device = _tmp7_;
-#line 1604 "ui.c"
+#line 1603 "ui.c"
 			{
 				gint n_delete = 0;
 				GtkListStore* _tmp8_ = NULL;
@@ -1609,30 +1608,30 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 				gboolean _tmp11_ = FALSE;
 				gint _tmp23_ = 0;
 				gint _tmp46_ = 0;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				n_delete = -1;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = self->priv->device_model;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = index;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp11_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp8_, &_tmp10_, NULL, _tmp9_);
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				iter = _tmp10_;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp11_) {
-#line 1625 "ui.c"
+#line 1624 "ui.c"
 					gint i = 0;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					i = 0;
-#line 1629 "ui.c"
+#line 1628 "ui.c"
 					{
 						gboolean _tmp12_ = FALSE;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp12_ = TRUE;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						while (TRUE) {
-#line 1636 "ui.c"
+#line 1635 "ui.c"
 							gchar* name = NULL;
 							gboolean matched = FALSE;
 							GtkListStore* _tmp15_ = NULL;
@@ -1642,94 +1641,94 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 							const gchar* _tmp19_ = NULL;
 							gboolean _tmp20_ = FALSE;
 							gint _tmp22_ = 0;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!_tmp12_) {
-#line 1648 "ui.c"
+#line 1647 "ui.c"
 								GtkListStore* _tmp13_ = NULL;
 								gboolean _tmp14_ = FALSE;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp13_ = self->priv->device_model;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp14_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp13_, &iter);
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								if (!_tmp14_) {
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									break;
-#line 1659 "ui.c"
+#line 1658 "ui.c"
 								}
 							}
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp12_ = FALSE;
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp15_ = self->priv->device_model;
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp16_ = iter;
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							gtk_tree_model_get ((GtkTreeModel*) _tmp15_, &_tmp16_, 0, &name, -1, -1);
 #line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							gtk_tree_model_get ((GtkTreeModel*) _tmp15_, &_tmp16_, 0, &name, -1, -1);
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp17_ = name;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp18_ = device;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp19_ = _tmp18_->name;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							matched = g_strcmp0 (_tmp17_, _tmp19_) == 0;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp20_ = matched;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (_tmp20_) {
-#line 1682 "ui.c"
+#line 1681 "ui.c"
 								gint _tmp21_ = 0;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp21_ = i;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								n_delete = _tmp21_;
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+								n_delete = _tmp21_;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_g_free0 (name);
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								break;
-#line 1692 "ui.c"
+#line 1691 "ui.c"
 							}
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp22_ = i;
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							i = _tmp22_ + 1;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (name);
-#line 1700 "ui.c"
+#line 1699 "ui.c"
 						}
 					}
 				}
-#line 445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp23_ = n_delete;
-#line 445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp23_ >= 0) {
-#line 1708 "ui.c"
+#line 1707 "ui.c"
 					gint i = 0;
 					GtkListStore* _tmp24_ = NULL;
 					GtkTreeIter _tmp25_ = {0};
 					ScanDevice* _tmp26_ = NULL;
 					const gchar* _tmp27_ = NULL;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp24_ = self->priv->device_model;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp25_ = iter;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp26_ = device;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp27_ = _tmp26_->label;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_list_store_set (_tmp24_, &_tmp25_, 1, _tmp27_, -1, -1);
-#line 1724 "ui.c"
+#line 1723 "ui.c"
 					{
 						gboolean _tmp28_ = FALSE;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						i = 0;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp28_ = TRUE;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						while (TRUE) {
-#line 1733 "ui.c"
+#line 1732 "ui.c"
 							gint _tmp30_ = 0;
 							gint _tmp31_ = 0;
 							GtkListStore* _tmp32_ = NULL;
@@ -1737,43 +1736,43 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 							GtkTreeIter _tmp34_ = {0};
 							GtkListStore* _tmp35_ = NULL;
 							GtkTreeIter _tmp36_ = {0};
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!_tmp28_) {
-#line 1743 "ui.c"
+#line 1742 "ui.c"
 								gint _tmp29_ = 0;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp29_ = i;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								i = _tmp29_ + 1;
-#line 1749 "ui.c"
+#line 1748 "ui.c"
 							}
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp28_ = FALSE;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp30_ = i;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp31_ = n_delete;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!(_tmp30_ < _tmp31_)) {
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								break;
-#line 1761 "ui.c"
+#line 1760 "ui.c"
 							}
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp32_ = self->priv->device_model;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp33_ = index;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp32_, &_tmp34_, NULL, _tmp33_);
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							iter = _tmp34_;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							iter = _tmp34_;
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp35_ = self->priv->device_model;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp36_ = iter;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							gtk_list_store_remove (_tmp35_, &_tmp36_);
-#line 1777 "ui.c"
+#line 1776 "ui.c"
 						}
 					}
 				} else {
@@ -1786,138 +1785,138 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices, const
 					const gchar* _tmp43_ = NULL;
 					ScanDevice* _tmp44_ = NULL;
 					const gchar* _tmp45_ = NULL;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp37_ = self->priv->device_model;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp38_ = index;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_list_store_insert (_tmp37_, &_tmp39_, _tmp38_);
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					iter = _tmp39_;
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					iter = _tmp39_;
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp40_ = self->priv->device_model;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp41_ = iter;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp42_ = device;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp43_ = _tmp42_->name;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp44_ = device;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp45_ = _tmp44_->label;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_list_store_set (_tmp40_, &_tmp41_, 0, _tmp43_, 1, _tmp45_, -1, -1);
-#line 1812 "ui.c"
+#line 1811 "ui.c"
 				}
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp46_ = index;
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				index = _tmp46_ + 1;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_scan_device_unref0 (device);
-#line 1820 "ui.c"
+#line 1819 "ui.c"
 			}
 		}
 	}
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
-#line 1826 "ui.c"
+#line 1825 "ui.c"
 		GtkListStore* _tmp47_ = NULL;
 		gint _tmp48_ = 0;
 		GtkTreeIter _tmp49_ = {0};
 		gboolean _tmp50_ = FALSE;
 		GtkListStore* _tmp51_ = NULL;
 		GtkTreeIter _tmp52_ = {0};
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp47_ = self->priv->device_model;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp48_ = index;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp50_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp47_, &_tmp49_, NULL, _tmp48_);
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp49_;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!_tmp50_) {
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 1845 "ui.c"
+#line 1844 "ui.c"
 		}
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp51_ = self->priv->device_model;
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp52_ = iter;
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_list_store_remove (_tmp51_, &_tmp52_);
-#line 1853 "ui.c"
+#line 1852 "ui.c"
 	}
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp53_ = have_selection;
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp53_) {
-#line 1859 "ui.c"
+#line 1858 "ui.c"
 		gchar* device = NULL;
 		GSettings* _tmp54_ = NULL;
 		gchar* _tmp55_ = NULL;
 		gboolean _tmp56_ = FALSE;
 		const gchar* _tmp57_ = NULL;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp54_ = self->priv->settings;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp55_ = g_settings_get_string (_tmp54_, "selected-device");
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		device = _tmp55_;
 #line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		device = _tmp55_;
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp57_ = device;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp57_ != NULL) {
-#line 1875 "ui.c"
+#line 1874 "ui.c"
 			const gchar* _tmp58_ = NULL;
 			GtkTreeIter _tmp59_ = {0};
 			gboolean _tmp60_ = FALSE;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp58_ = device;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp60_ = user_interface_find_scan_device (self, _tmp58_, &_tmp59_);
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			iter = _tmp59_;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp56_ = _tmp60_;
-#line 1887 "ui.c"
+#line 1886 "ui.c"
 		} else {
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp56_ = FALSE;
-#line 1891 "ui.c"
+#line 1890 "ui.c"
 		}
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp56_) {
-#line 1895 "ui.c"
+#line 1894 "ui.c"
 			GtkComboBox* _tmp61_ = NULL;
 			GtkTreeIter _tmp62_ = {0};
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp61_ = self->priv->device_combo;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp62_ = iter;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_combo_box_set_active_iter (_tmp61_, &_tmp62_);
-#line 1904 "ui.c"
+#line 1903 "ui.c"
 		} else {
 			GtkComboBox* _tmp63_ = NULL;
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp63_ = self->priv->device_combo;
-#line 477 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_combo_box_set_active (_tmp63_, 0);
-#line 1911 "ui.c"
+#line 1910 "ui.c"
 		}
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (device);
-#line 1915 "ui.c"
+#line 1914 "ui.c"
 	}
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->setting_devices = FALSE;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_info_bar (self);
-#line 1921 "ui.c"
+#line 1920 "ui.c"
 }
 
 
@@ -1930,69 +1929,69 @@ static void user_interface_add_default_page (UserInterface* self) {
 	Page* _tmp4_ = NULL;
 	Book* _tmp5_ = NULL;
 	BookView* _tmp6_ = NULL;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->default_page_width;
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->default_page_height;
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->default_page_dpi;
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->default_page_scan_direction;
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_new (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp4_;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->_book;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_append_page (_tmp5_, page);
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	book_append_page (_tmp5_, page);
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->book_view;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_view_set_selected_page (_tmp6_, page);
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 1958 "ui.c"
+#line 1957 "ui.c"
 }
 
 
 static Block1Data* block1_data_ref (Block1Data* _data1_) {
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_atomic_int_inc (&_data1_->_ref_count_);
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return _data1_;
-#line 1967 "ui.c"
+#line 1966 "ui.c"
 }
 
 
 static void block1_data_unref (void * _userdata_) {
 	Block1Data* _data1_;
 	_data1_ = (Block1Data*) _userdata_;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
-#line 1976 "ui.c"
+#line 1975 "ui.c"
 		UserInterface* self;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self = _data1_->self;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data1_->file_type_combo);
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data1_->file_type_store);
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (self);
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_slice_free (Block1Data, _data1_);
-#line 1988 "ui.c"
+#line 1987 "ui.c"
 	}
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1996 "ui.c"
+#line 1995 "ui.c"
 }
 
 
@@ -2017,7 +2016,7 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	_tmp3_ = _result_;
 #line 933 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 2021 "ui.c"
+#line 2020 "ui.c"
 		gchar* _tmp4_ = NULL;
 #line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
@@ -2025,13 +2024,13 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 		result = (gint) (_tmp4_ - ((gchar*) self));
 #line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 		return result;
-#line 2029 "ui.c"
+#line 2028 "ui.c"
 	} else {
 #line 936 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 		result = -1;
 #line 936 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 		return result;
-#line 2035 "ui.c"
+#line 2034 "ui.c"
 	}
 }
 
@@ -2065,7 +2064,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp2_ = start;
 #line 1232 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 2069 "ui.c"
+#line 2068 "ui.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 #line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
@@ -2074,13 +2073,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp4_ = start;
 #line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 2078 "ui.c"
+#line 2077 "ui.c"
 	}
 #line 1235 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
 #line 1235 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 2084 "ui.c"
+#line 2083 "ui.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
 #line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
@@ -2089,13 +2088,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp7_ = end;
 #line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 2093 "ui.c"
+#line 2092 "ui.c"
 	}
 #line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
 #line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 2099 "ui.c"
+#line 2098 "ui.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
 #line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
@@ -2104,11 +2103,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp11_ = string_length;
 #line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 2108 "ui.c"
+#line 2107 "ui.c"
 	} else {
 #line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 2112 "ui.c"
+#line 2111 "ui.c"
 	}
 #line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
@@ -2116,7 +2115,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp13_ = end;
 #line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 2120 "ui.c"
+#line 2119 "ui.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
 #line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
@@ -2125,11 +2124,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp15_ = string_length;
 #line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 2129 "ui.c"
+#line 2128 "ui.c"
 	} else {
 #line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 2133 "ui.c"
+#line 2132 "ui.c"
 	}
 #line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
@@ -2151,7 +2150,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	result = _tmp21_;
 #line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	return result;
-#line 2155 "ui.c"
+#line 2154 "ui.c"
 }
 
 
@@ -2178,99 +2177,99 @@ static void __lambda5_ (Block1Data* _data1_) {
 	gchar* _tmp18_ = NULL;
 	GtkFileChooserDialog* _tmp19_ = NULL;
 	const gchar* _tmp20_ = NULL;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data1_->self;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("");
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extension = _tmp0_;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _data1_->file_type_combo;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = gtk_combo_box_get_active_iter (_tmp1_, &_tmp2_);
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	i = _tmp2_;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 2196 "ui.c"
+#line 2195 "ui.c"
 		GtkListStore* _tmp4_ = NULL;
 		GtkTreeIter _tmp5_ = {0};
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = _data1_->file_type_store;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = i;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp4_, &_tmp5_, 1, &extension, -1, -1);
-#line 2205 "ui.c"
+#line 2204 "ui.c"
 	}
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->save_dialog;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp6_);
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	path = _tmp7_;
 #line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	path = _tmp7_;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = path;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = g_path_get_basename (_tmp8_);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp9_;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = filename;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = string_last_index_of_char (_tmp10_, (gunichar) '.', 0);
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	extension_index = _tmp11_;
 #line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	extension_index = _tmp11_;
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = extension_index;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp12_ >= 0) {
-#line 2229 "ui.c"
+#line 2228 "ui.c"
 		const gchar* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
 		gchar* _tmp15_ = NULL;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = filename;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = extension_index;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = string_slice (_tmp13_, (glong) 0, (glong) _tmp14_);
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		filename = _tmp15_;
-#line 2243 "ui.c"
+#line 2242 "ui.c"
 	}
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = filename;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = extension;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = g_strconcat (_tmp16_, _tmp17_, NULL);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	filename = _tmp18_;
 #line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	filename = _tmp18_;
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = self->priv->save_dialog;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = filename;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp19_, _tmp20_);
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (path);
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (extension);
-#line 2267 "ui.c"
+#line 2266 "ui.c"
 }
 
 
 static void ___lambda5__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda5_ (self);
-#line 2274 "ui.c"
+#line 2273 "ui.c"
 }
 
 
@@ -2359,279 +2358,279 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 	gchar* _tmp94_ = NULL;
 	gchar* _tmp95_ = NULL;
 	GtkFileChooserDialog* _tmp96_ = NULL;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_ = g_slice_new0 (Block1Data);
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_->_ref_count_ = 1;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_->self = g_object_ref (self);
-#line 498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	directory = NULL;
 #line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	directory = NULL;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_settings_get_string (_tmp0_, "save-directory");
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (directory);
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	directory = _tmp1_;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = directory;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_ == NULL) {
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = TRUE;
-#line 2387 "ui.c"
+#line 2386 "ui.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = directory;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, "") == 0;
-#line 2394 "ui.c"
+#line 2393 "ui.c"
 	}
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 2398 "ui.c"
+#line 2397 "ui.c"
 		const gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = g_strdup (_tmp5_);
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (directory);
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		directory = _tmp6_;
-#line 2409 "ui.c"
+#line 2408 "ui.c"
 	}
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _ ("Save As...");
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("_Cancel");
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = _ ("_Save");
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp7_, (GtkWindow*) self, GTK_FILE_CHOOSER_ACTION_SAVE, _tmp8_, GTK_RESPONSE_CANCEL, _tmp9_, GTK_RESPONSE_ACCEPT, NULL, NULL);
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp10_);
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_dialog);
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_dialog = _tmp10_;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = self->priv->save_dialog;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_do_overwrite_confirmation ((GtkFileChooser*) _tmp11_, TRUE);
 #line 512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_chooser_set_do_overwrite_confirmation ((GtkFileChooser*) _tmp11_, TRUE);
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = self->priv->save_dialog;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_local_only ((GtkFileChooser*) _tmp12_, FALSE);
 #line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_chooser_set_local_only ((GtkFileChooser*) _tmp12_, FALSE);
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->save_dialog;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = directory;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_current_folder ((GtkFileChooser*) _tmp13_, _tmp14_);
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->save_dialog;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = _ ("Scanned Document.pdf");
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp15_, _tmp16_);
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = gtk_file_filter_new ();
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp17_);
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	filter = _tmp17_;
 #line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	filter = _tmp17_;
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = filter;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = _ ("Image Files");
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_set_name (_tmp18_, _tmp19_);
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = filter;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_filter_add_pixbuf_formats (_tmp20_);
 #line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_filter_add_pixbuf_formats (_tmp20_);
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = filter;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_filter_add_mime_type (_tmp21_, "application/pdf");
 #line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_filter_add_mime_type (_tmp21_, "application/pdf");
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = self->priv->save_dialog;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = filter;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp22_, _tmp24_);
 #line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp22_, _tmp24_);
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = gtk_file_filter_new ();
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp25_);
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (filter);
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	filter = _tmp25_;
 #line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	filter = _tmp25_;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = filter;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = _ ("All Files");
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_set_name (_tmp26_, _tmp27_);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = filter;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_filter_add_pattern (_tmp28_, "*");
 #line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_filter_add_pattern (_tmp28_, "*");
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = self->priv->save_dialog;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = filter;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = _g_object_ref0 (_tmp30_);
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp29_, _tmp31_);
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING, -1);
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_->file_type_store = _tmp32_;
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = _data1_->file_type_store;
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp33_, &_tmp34_);
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp34_;
 #line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp34_;
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = _data1_->file_type_store;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp36_ = iter;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp37_ = _ ("PDF (multi-page document)");
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp35_, &_tmp36_, 0, _tmp37_, 1, ".pdf", -1, -1);
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp38_ = _data1_->file_type_store;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp38_, &_tmp39_);
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp39_;
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp39_;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp40_ = _data1_->file_type_store;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp41_ = iter;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp42_ = _ ("JPEG (compressed)");
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp40_, &_tmp41_, 0, _tmp42_, 1, ".jpg", -1, -1);
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp43_ = _data1_->file_type_store;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp43_, &_tmp44_);
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp44_;
 #line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp44_;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp45_ = _data1_->file_type_store;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp46_ = iter;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp47_ = _ ("PNG (lossless)");
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp45_, &_tmp46_, 0, _tmp47_, 1, ".png", -1, -1);
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp48_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp48_);
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	box = _tmp48_;
 #line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	box = _tmp48_;
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp49_ = box;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp49_, TRUE);
 #line 553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp49_, TRUE);
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp50_ = self->priv->save_dialog;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp51_ = box;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_extra_widget ((GtkFileChooser*) _tmp50_, (GtkWidget*) _tmp51_);
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp52_ = _ ("File format:");
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp53_ = (GtkLabel*) gtk_label_new (_tmp52_);
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp53_);
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	label = _tmp53_;
 #line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	label = _tmp53_;
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp54_ = label;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp54_, TRUE);
 #line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp54_, TRUE);
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp55_ = box;
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp56_ = label;
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp55_, (GtkWidget*) _tmp56_, FALSE, FALSE, (guint) 0);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp57_ = _data1_->file_type_store;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp58_ = (GtkComboBox*) gtk_combo_box_new_with_model ((GtkTreeModel*) _tmp57_);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp58_);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data1_->file_type_combo = _tmp58_;
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data1_->file_type_combo = _tmp58_;
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp59_ = _data1_->file_type_combo;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp59_, TRUE);
 #line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp59_, TRUE);
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp60_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp60_);
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp60_;
 #line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	renderer = _tmp60_;
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp61_ = _data1_->file_type_combo;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp62_ = renderer;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp61_, (GtkCellRenderer*) _tmp62_, TRUE);
 #line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp61_, (GtkCellRenderer*) _tmp62_, TRUE);
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp63_ = _data1_->file_type_combo;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp64_ = renderer;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp63_, (GtkCellRenderer*) _tmp64_, "text", 0);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp65_ = _data1_->file_type_combo;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_combo_box_set_active (_tmp65_, 0);
 #line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_combo_box_set_active (_tmp65_, 0);
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp66_ = _data1_->file_type_combo;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_data (_tmp66_, "changed", (GCallback) ___lambda5__gtk_combo_box_changed, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp67_ = box;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp68_ = _data1_->file_type_combo;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp67_, (GtkWidget*) _tmp68_, FALSE, FALSE, (guint) 0);
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp69_ = self->priv->save_dialog;
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp70_ = gtk_dialog_run ((GtkDialog*) _tmp69_);
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	response = _tmp70_;
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	uri = NULL;
 #line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	uri = NULL;
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp71_ = response;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp71_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2635 "ui.c"
+#line 2634 "ui.c"
 		gchar* extension = NULL;
 		gchar* _tmp72_ = NULL;
 		GtkTreeIter i = {0};
@@ -2652,128 +2651,128 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 		GFile* _tmp89_ = NULL;
 		GFile* _tmp90_ = NULL;
 		gchar* _tmp91_ = NULL;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp72_ = g_strdup ("");
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		extension = _tmp72_;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp73_ = _data1_->file_type_combo;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp75_ = gtk_combo_box_get_active_iter (_tmp73_, &_tmp74_);
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		i = _tmp74_;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp75_) {
-#line 2668 "ui.c"
+#line 2667 "ui.c"
 			GtkListStore* _tmp76_ = NULL;
 			GtkTreeIter _tmp77_ = {0};
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp76_ = _data1_->file_type_store;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp77_ = i;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_tree_model_get ((GtkTreeModel*) _tmp76_, &_tmp77_, 1, &extension, -1, -1);
-#line 2677 "ui.c"
+#line 2676 "ui.c"
 		}
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp78_ = self->priv->save_dialog;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp79_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp78_);
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		path = _tmp79_;
 #line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		path = _tmp79_;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp80_ = path;
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp81_ = g_path_get_basename (_tmp80_);
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		filename = _tmp81_;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp82_ = filename;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp83_ = string_last_index_of_char (_tmp82_, (gunichar) '.', 0);
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		extension_index = _tmp83_;
 #line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		extension_index = _tmp83_;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp84_ = extension_index;
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp84_ < 0) {
-#line 2701 "ui.c"
+#line 2700 "ui.c"
 			const gchar* _tmp85_ = NULL;
 			const gchar* _tmp86_ = NULL;
 			gchar* _tmp87_ = NULL;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp85_ = path;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp86_ = extension;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp87_ = g_strconcat (_tmp85_, _tmp86_, NULL);
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (path);
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			path = _tmp87_;
-#line 2715 "ui.c"
+#line 2714 "ui.c"
 		}
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp88_ = path;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp89_ = g_file_new_for_path (_tmp88_);
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp90_ = _tmp89_;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp91_ = g_file_get_uri (_tmp90_);
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp91_;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_tmp90_);
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (extension);
-#line 2737 "ui.c"
+#line 2736 "ui.c"
 	}
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp92_ = self->priv->settings;
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp93_ = self->priv->save_dialog;
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp94_ = gtk_file_chooser_get_current_folder ((GtkFileChooser*) _tmp93_);
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp95_ = _tmp94_;
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_string (_tmp92_, "save-directory", _tmp95_);
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp95_);
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp96_ = self->priv->save_dialog;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _tmp96_);
 #line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _tmp96_);
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_dialog);
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_dialog = NULL;
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = uri;
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (label);
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (box);
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (filter);
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (directory);
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	block1_data_unref (_data1_);
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_ = NULL;
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 2777 "ui.c"
+#line 2776 "ui.c"
 }
 
 
@@ -2798,194 +2797,194 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 	gchar* _tmp39_ = NULL;
 	Book* _tmp40_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_uri;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_ != NULL) {
-#line 2808 "ui.c"
+#line 2807 "ui.c"
 		gboolean _tmp2_ = FALSE;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = force_choose_location;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = !_tmp2_;
-#line 2814 "ui.c"
+#line 2813 "ui.c"
 	} else {
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = FALSE;
-#line 2818 "ui.c"
+#line 2817 "ui.c"
 	}
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 2822 "ui.c"
+#line 2821 "ui.c"
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->book_uri;
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_strdup (_tmp3_);
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp4_;
-#line 2833 "ui.c"
+#line 2832 "ui.c"
 	} else {
 		gchar* _tmp5_ = NULL;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_choose_file_location (self);
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp5_;
-#line 2842 "ui.c"
+#line 2841 "ui.c"
 	}
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = uri;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp6_ == NULL) {
 #line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp6_ == NULL) {
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 2854 "ui.c"
+#line 2853 "ui.c"
 	}
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = uri;
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = g_file_new_for_uri (_tmp7_);
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file = _tmp8_;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = uri;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:626: Saving to '%s'", _tmp9_);
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:627: Saving to '%s'", _tmp9_);
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = uri;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = g_utf8_strdown (_tmp10_, (gssize) -1);
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	uri_lower = _tmp11_;
 #line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	uri_lower = _tmp11_;
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = g_strdup ("jpeg");
-#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	format = _tmp12_;
 #line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	format = _tmp12_;
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = uri_lower;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = g_str_has_suffix (_tmp13_, ".pdf");
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp14_) {
-#line 2882 "ui.c"
+#line 2881 "ui.c"
 		gchar* _tmp15_ = NULL;
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = g_strdup ("pdf");
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		format = _tmp15_;
-#line 2890 "ui.c"
+#line 2889 "ui.c"
 	} else {
 		const gchar* _tmp16_ = NULL;
 		gboolean _tmp17_ = FALSE;
-#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = uri_lower;
-#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = g_str_has_suffix (_tmp16_, ".ps");
-#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp17_) {
-#line 2900 "ui.c"
+#line 2899 "ui.c"
 			gchar* _tmp18_ = NULL;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp18_ = g_strdup ("ps");
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (format);
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			format = _tmp18_;
-#line 2908 "ui.c"
+#line 2907 "ui.c"
 		} else {
 			const gchar* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp19_ = uri_lower;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp20_ = g_str_has_suffix (_tmp19_, ".png");
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp20_) {
-#line 2918 "ui.c"
+#line 2917 "ui.c"
 				gchar* _tmp21_ = NULL;
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = g_strdup ("png");
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (format);
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				format = _tmp21_;
-#line 2926 "ui.c"
+#line 2925 "ui.c"
 			} else {
 				gboolean _tmp22_ = FALSE;
 				const gchar* _tmp23_ = NULL;
 				gboolean _tmp24_ = FALSE;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp23_ = uri_lower;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp24_ = g_str_has_suffix (_tmp23_, ".tif");
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp24_) {
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = TRUE;
-#line 2939 "ui.c"
+#line 2938 "ui.c"
 				} else {
 					const gchar* _tmp25_ = NULL;
 					gboolean _tmp26_ = FALSE;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp25_ = uri_lower;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp26_ = g_str_has_suffix (_tmp25_, ".tiff");
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = _tmp26_;
-#line 2949 "ui.c"
+#line 2948 "ui.c"
 				}
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp22_) {
-#line 2953 "ui.c"
+#line 2952 "ui.c"
 					gchar* _tmp27_ = NULL;
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp27_ = g_strdup ("tiff");
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (format);
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					format = _tmp27_;
-#line 2961 "ui.c"
+#line 2960 "ui.c"
 				}
 			}
 		}
 	}
-#line 639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_progress_dialog (self);
-#line 2968 "ui.c"
+#line 2967 "ui.c"
 	{
 		Book* _tmp28_ = NULL;
 		const gchar* _tmp29_ = NULL;
 		gint _tmp30_ = 0;
 		gint _tmp31_ = 0;
 		GFile* _tmp32_ = NULL;
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp28_ = self->priv->_book;
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp29_ = format;
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp30_ = user_interface_get_quality (self);
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp31_ = _tmp30_;
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp32_ = file;
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_save (_tmp28_, _tmp29_, _tmp31_, _tmp32_, &_inner_error_);
-#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2989 "ui.c"
+#line 2988 "ui.c"
 			goto __catch17_g_error;
 		}
 	}
@@ -2998,86 +2997,86 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		const gchar* _tmp35_ = NULL;
 		GError* _tmp36_ = NULL;
 		const gchar* _tmp37_ = NULL;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_hide_progress_dialog (self);
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_hide_progress_dialog (self);
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp33_ = e;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp34_ = _tmp33_->message;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:647: Error saving file: %s", _tmp34_);
 #line 648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:648: Error saving file: %s", _tmp34_);
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp35_ = _ ("Failed to save file");
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp36_ = e;
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp37_ = _tmp36_->message;
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error (self, _tmp35_, _tmp37_, FALSE);
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri_lower);
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3036 "ui.c"
+#line 3035 "ui.c"
 	}
 	__finally17:
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri_lower);
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return FALSE;
-#line 3055 "ui.c"
+#line 3054 "ui.c"
 	}
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp38_ = uri;
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp39_ = g_strdup (_tmp38_);
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->book_uri = _tmp39_;
 #line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->book_uri = _tmp39_;
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp40_ = self->priv->_book;
-#line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_set_needs_saving (_tmp40_, FALSE);
 #line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	book_set_needs_saving (_tmp40_, FALSE);
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (format);
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (uri_lower);
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file);
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (uri);
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3081 "ui.c"
+#line 3080 "ui.c"
 }
 
 
@@ -3102,124 +3101,124 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 	gint _tmp14_ = 0;
 	GtkMessageDialog* _tmp15_ = NULL;
 	gint _tmp16_ = 0;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (title != NULL, FALSE);
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (discard_label != NULL, FALSE);
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_get_needs_saving (_tmp0_);
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp2_) {
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (!_tmp2_) {
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3124 "ui.c"
+#line 3123 "ui.c"
 	}
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = title;
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp3_);
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp4_);
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dialog = _tmp4_;
-#line 670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = dialog;
-#line 670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _ ("If you don't save, changes will be permanently lost.");
-#line 670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_message_dialog_format_secondary_text (_tmp5_, "%s", _tmp6_);
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = dialog;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = discard_label;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_add_button ((GtkDialog*) _tmp7_, _tmp8_, (gint) GTK_RESPONSE_NO);
 #line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_dialog_add_button ((GtkDialog*) _tmp7_, _tmp8_, (gint) GTK_RESPONSE_NO);
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = dialog;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = _ ("_Cancel");
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_add_button ((GtkDialog*) _tmp9_, _tmp10_, (gint) GTK_RESPONSE_CANCEL);
 #line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_dialog_add_button ((GtkDialog*) _tmp9_, _tmp10_, (gint) GTK_RESPONSE_CANCEL);
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = dialog;
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = _ ("_Save");
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_add_button ((GtkDialog*) _tmp11_, _tmp12_, (gint) GTK_RESPONSE_YES);
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = dialog;
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = gtk_dialog_run ((GtkDialog*) _tmp13_);
-#line 677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	response = _tmp14_;
 #line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	response = _tmp14_;
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = dialog;
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _tmp15_);
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = response;
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (_tmp16_) {
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_YES:
-#line 3174 "ui.c"
+#line 3173 "ui.c"
 		{
 			gboolean _tmp17_ = FALSE;
-#line 683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp17_ = user_interface_save_document (self, FALSE);
-#line 683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (_tmp17_) {
 #line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			if (_tmp17_) {
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				result = TRUE;
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (dialog);
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
-#line 3187 "ui.c"
+#line 3186 "ui.c"
 			} else {
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				result = FALSE;
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (dialog);
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
-#line 3195 "ui.c"
+#line 3194 "ui.c"
 			}
 		}
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_NO:
-#line 3200 "ui.c"
+#line 3199 "ui.c"
 		{
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			result = TRUE;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (dialog);
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
-#line 3208 "ui.c"
+#line 3207 "ui.c"
 		}
 		default:
 		{
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			result = FALSE;
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (dialog);
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
-#line 3218 "ui.c"
+#line 3217 "ui.c"
 		}
 	}
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
-#line 3223 "ui.c"
+#line 3222 "ui.c"
 }
 
 
@@ -3228,31 +3227,31 @@ static void user_interface_clear_document (UserInterface* self) {
 	Book* _tmp1_ = NULL;
 	GtkMenuItem* _tmp2_ = NULL;
 	GtkMenuItem* _tmp3_ = NULL;
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_clear (_tmp0_);
 #line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_add_default_page (self);
+	book_clear (_tmp0_);
 #line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_add_default_page (self);
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->book_uri = NULL;
 #line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->book_uri = NULL;
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_set_needs_saving (_tmp1_, FALSE);
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	book_set_needs_saving (_tmp1_, FALSE);
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->save_as_menuitem;
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_sensitive ((GtkWidget*) _tmp2_, FALSE);
 #line 701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_sensitive ((GtkWidget*) _tmp2_, FALSE);
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->copy_to_clipboard_menuitem;
-#line 701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, FALSE);
-#line 3256 "ui.c"
+#line 3255 "ui.c"
 }
 
 
@@ -3262,60 +3261,60 @@ static void user_interface_new_document (UserInterface* self) {
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Save current document?");
-#line 706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Discard Changes");
-#line 706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_prompt_to_save (self, _tmp0_, _tmp1_);
-#line 706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 3278 "ui.c"
+#line 3277 "ui.c"
 	}
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = user_interface_get_scanning (self);
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _tmp3_;
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp4_) {
 #line 713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp4_) {
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
-#line 3288 "ui.c"
+#line 3287 "ui.c"
 	}
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_clear_document (self);
-#line 3292 "ui.c"
+#line 3291 "ui.c"
 }
 
 
 static void user_interface_new_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document (self);
-#line 3303 "ui.c"
+#line 3302 "ui.c"
 }
 
 
 static void _user_interface_new_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_button_clicked_cb ((UserInterface*) self, _sender);
-#line 3310 "ui.c"
+#line 3309 "ui.c"
 }
 
 
 void user_interface_new_document_activate_cb (UserInterface* self) {
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document (self);
-#line 3319 "ui.c"
+#line 3318 "ui.c"
 }
 
 
@@ -3324,78 +3323,78 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar*
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp10_ = FALSE;
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (document_hint != NULL);
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = document_hint;
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->document_hint);
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->document_hint = _tmp1_;
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = document_hint;
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp2_, "text") == 0) {
-#line 3344 "ui.c"
+#line 3343 "ui.c"
 		GtkRadioMenuItem* _tmp3_ = NULL;
 		GtkRadioMenuItem* _tmp4_ = NULL;
 		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->text_button_menuitem;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp3_, TRUE);
 #line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp3_, TRUE);
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->text_button_hb_menuitem;
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
 #line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->text_menuitem;
-#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
-#line 3360 "ui.c"
+#line 3359 "ui.c"
 	} else {
 		const gchar* _tmp6_ = NULL;
-#line 738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = document_hint;
-#line 738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (g_strcmp0 (_tmp6_, "photo") == 0) {
-#line 3367 "ui.c"
+#line 3366 "ui.c"
 			GtkRadioMenuItem* _tmp7_ = NULL;
 			GtkRadioMenuItem* _tmp8_ = NULL;
 			GtkRadioMenuItem* _tmp9_ = NULL;
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp7_ = self->priv->photo_button_menuitem;
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp7_, TRUE);
 #line 741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp7_, TRUE);
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp8_ = self->priv->photo_button_hb_menuitem;
-#line 741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp8_, TRUE);
 #line 742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp8_, TRUE);
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = self->priv->photo_menuitem;
-#line 742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp9_, TRUE);
-#line 3383 "ui.c"
+#line 3382 "ui.c"
 		}
 	}
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = save;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp10_) {
-#line 3390 "ui.c"
+#line 3389 "ui.c"
 		GSettings* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = self->priv->settings;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = document_hint;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_settings_set_string (_tmp11_, "document-type", _tmp12_);
-#line 3399 "ui.c"
+#line 3398 "ui.c"
 	}
 }
 
@@ -3404,21 +3403,21 @@ static void user_interface_text_menuitem_toggled_cb (UserInterface* self, GtkChe
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
 #line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, "text", TRUE);
-#line 3422 "ui.c"
+#line 3421 "ui.c"
 	}
 }
 
@@ -3426,7 +3425,7 @@ static void user_interface_text_menuitem_toggled_cb (UserInterface* self, GtkChe
 static void _user_interface_text_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_text_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 3430 "ui.c"
+#line 3429 "ui.c"
 }
 
 
@@ -3434,21 +3433,21 @@ static void user_interface_photo_menuitem_toggled_cb (UserInterface* self, GtkCh
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
 #line 760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, "photo", TRUE);
-#line 3452 "ui.c"
+#line 3451 "ui.c"
 	}
 }
 
@@ -3456,7 +3455,7 @@ static void user_interface_photo_menuitem_toggled_cb (UserInterface* self, GtkCh
 static void _user_interface_photo_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_photo_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 3460 "ui.c"
+#line 3459 "ui.c"
 }
 
 
@@ -3465,71 +3464,71 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 	GtkListStore* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_side_model;
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3479 "ui.c"
+#line 3478 "ui.c"
 		{
 			gboolean _tmp3_ = FALSE;
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = TRUE;
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 3486 "ui.c"
+#line 3485 "ui.c"
 				gint s = 0;
 				GtkListStore* _tmp6_ = NULL;
 				GtkTreeIter _tmp7_ = {0};
 				gint _tmp8_ = 0;
 				ScanType _tmp9_ = 0;
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp3_) {
-#line 3494 "ui.c"
+#line 3493 "ui.c"
 					GtkListStore* _tmp4_ = NULL;
 					gboolean _tmp5_ = FALSE;
-#line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp4_ = self->priv->page_side_model;
-#line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp5_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp4_, &iter);
-#line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp5_) {
-#line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 3505 "ui.c"
+#line 3504 "ui.c"
 					}
 				}
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp3_ = FALSE;
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp6_ = self->priv->page_side_model;
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = iter;
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				gtk_tree_model_get ((GtkTreeModel*) _tmp6_, &_tmp7_, 0, &s, -1, -1);
 #line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				gtk_tree_model_get ((GtkTreeModel*) _tmp6_, &_tmp7_, 0, &s, -1, -1);
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = s;
-#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = page_side;
-#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp8_ == ((gint) _tmp9_)) {
-#line 3522 "ui.c"
+#line 3521 "ui.c"
 					GtkComboBox* _tmp10_ = NULL;
 					GtkTreeIter _tmp11_ = {0};
-#line 775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp10_ = self->priv->page_side_combo;
-#line 775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp11_ = iter;
-#line 775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_combo_box_set_active_iter (_tmp10_, &_tmp11_);
 #line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gtk_combo_box_set_active_iter (_tmp10_, &_tmp11_);
+#line 777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					return;
-#line 3533 "ui.c"
+#line 3532 "ui.c"
 				}
 			}
 		}
@@ -3542,27 +3541,27 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 	gboolean have_iter = FALSE;
 	gboolean _tmp14_ = FALSE;
 	gboolean _tmp18_ = FALSE;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 3548 "ui.c"
+#line 3547 "ui.c"
 	{
 		GtkListStore* _tmp0_ = NULL;
 		GtkTreeIter _tmp1_ = {0};
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = self->priv->paper_size_model;
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp1_;
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_iter = _tmp2_;
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = TRUE;
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		while (TRUE) {
-#line 3566 "ui.c"
+#line 3565 "ui.c"
 			gboolean _tmp6_ = FALSE;
 			gint w = 0;
 			gint h = 0;
@@ -3571,96 +3570,96 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 			gboolean _tmp9_ = FALSE;
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (!_tmp3_) {
-#line 3577 "ui.c"
+#line 3576 "ui.c"
 				GtkListStore* _tmp4_ = NULL;
 				gboolean _tmp5_ = FALSE;
-#line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp4_ = self->priv->paper_size_model;
-#line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp5_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp4_, &iter);
-#line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				have_iter = _tmp5_;
-#line 3586 "ui.c"
+#line 3585 "ui.c"
 			}
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp3_ = FALSE;
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp3_ = FALSE;
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp6_ = have_iter;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (!_tmp6_) {
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 3596 "ui.c"
+#line 3595 "ui.c"
 			}
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp7_ = self->priv->paper_size_model;
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp8_ = iter;
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_tree_model_get ((GtkTreeModel*) _tmp7_, &_tmp8_, 0, &w, 1, &h, -1, -1);
 #line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gtk_tree_model_get ((GtkTreeModel*) _tmp7_, &_tmp8_, 0, &w, 1, &h, -1, -1);
+#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = w;
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = width;
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp10_ == _tmp11_) {
-#line 3610 "ui.c"
+#line 3609 "ui.c"
 				gint _tmp12_ = 0;
 				gint _tmp13_ = 0;
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = h;
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp13_ = height;
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = _tmp12_ == _tmp13_;
-#line 3619 "ui.c"
+#line 3618 "ui.c"
 			} else {
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = FALSE;
-#line 3623 "ui.c"
+#line 3622 "ui.c"
 			}
-#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (_tmp9_) {
 #line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			if (_tmp9_) {
+#line 795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 3629 "ui.c"
+#line 3628 "ui.c"
 			}
 		}
 	}
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = have_iter;
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp14_) {
-#line 3637 "ui.c"
+#line 3636 "ui.c"
 		GtkListStore* _tmp15_ = NULL;
 		GtkTreeIter _tmp16_ = {0};
 		gboolean _tmp17_ = FALSE;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = self->priv->paper_size_model;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp15_, &_tmp16_);
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp16_;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_iter = _tmp17_;
-#line 3649 "ui.c"
+#line 3648 "ui.c"
 	}
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = have_iter;
-#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp18_) {
-#line 3655 "ui.c"
+#line 3654 "ui.c"
 		GtkComboBox* _tmp19_ = NULL;
 		GtkTreeIter _tmp20_ = {0};
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = self->priv->paper_size_combo;
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp20_ = iter;
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_combo_box_set_active_iter (_tmp19_, &_tmp20_);
-#line 3664 "ui.c"
+#line 3663 "ui.c"
 	}
 }
 
@@ -3672,34 +3671,34 @@ static gint user_interface_get_text_dpi (UserInterface* self) {
 	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->text_dpi_combo;
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3688 "ui.c"
+#line 3687 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->text_dpi_model;
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
-#line 3697 "ui.c"
+#line 3696 "ui.c"
 	}
-#line 811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = dpi;
-#line 811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3703 "ui.c"
+#line 3702 "ui.c"
 }
 
 
@@ -3710,34 +3709,34 @@ static gint user_interface_get_photo_dpi (UserInterface* self) {
 	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->photo_dpi_combo;
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3726 "ui.c"
+#line 3725 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->photo_dpi_model;
-#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
-#line 3735 "ui.c"
+#line 3734 "ui.c"
 	}
-#line 822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = dpi;
-#line 822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3741 "ui.c"
+#line 3740 "ui.c"
 }
 
 
@@ -3749,36 +3748,36 @@ static ScanType user_interface_get_page_side (UserInterface* self) {
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
 	gint _tmp5_ = 0;
-#line 825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_side = (gint) SCAN_TYPE_ADF_BOTH;
-#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_side_combo;
-#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3765 "ui.c"
+#line 3764 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->page_side_model;
-#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &page_side, -1, -1);
-#line 3774 "ui.c"
+#line 3773 "ui.c"
 	}
-#line 833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page_side;
-#line 833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = (ScanType) _tmp5_;
-#line 833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3782 "ui.c"
+#line 3781 "ui.c"
 }
 
 
@@ -3791,66 +3790,66 @@ static gboolean user_interface_get_paper_size (UserInterface* self, gint* width,
 	GtkComboBox* _tmp1_ = NULL;
 	GtkTreeIter _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_height = 0;
-#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _vala_height;
-#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_width = _tmp0_;
 #line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_vala_width = _tmp0_;
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->paper_size_combo;
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = gtk_combo_box_get_active_iter (_tmp1_, &_tmp2_);
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp2_;
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 3811 "ui.c"
+#line 3810 "ui.c"
 		GtkListStore* _tmp4_ = NULL;
 		GtkTreeIter _tmp5_ = {0};
-#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->paper_size_model;
-#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = iter;
-#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_tree_model_get ((GtkTreeModel*) _tmp4_, &_tmp5_, 0, &_vala_width, 1, &_vala_height, -1, -1);
 #line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_tree_model_get ((GtkTreeModel*) _tmp4_, &_tmp5_, 0, &_vala_width, 1, &_vala_height, -1, -1);
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
-#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (width) {
-#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*width = _vala_width;
-#line 3826 "ui.c"
+#line 3825 "ui.c"
 		}
-#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (height) {
-#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*height = _vala_height;
-#line 3832 "ui.c"
+#line 3831 "ui.c"
 		}
-#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3836 "ui.c"
+#line 3835 "ui.c"
 	}
-#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (width) {
-#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*width = _vala_width;
-#line 3844 "ui.c"
+#line 3843 "ui.c"
 	}
-#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (height) {
-#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*height = _vala_height;
-#line 3850 "ui.c"
+#line 3849 "ui.c"
 	}
-#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3854 "ui.c"
+#line 3853 "ui.c"
 }
 
 
@@ -3869,88 +3868,88 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) {
 	ScanOptions* _tmp17_ = NULL;
 	gint _tmp18_ = 0;
 	gint _tmp19_ = 0;
-#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = scan_options_new ();
-#line 852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	options = _tmp0_;
 #line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	options = _tmp0_;
+#line 854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->document_hint;
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp1_, "text") == 0) {
-#line 3883 "ui.c"
+#line 3882 "ui.c"
 		ScanOptions* _tmp2_ = NULL;
 		ScanOptions* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 		ScanOptions* _tmp5_ = NULL;
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = options;
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_->scan_mode = SCAN_MODE_GRAY;
 #line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp2_->scan_mode = SCAN_MODE_GRAY;
+#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = options;
-#line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = user_interface_get_text_dpi (self);
-#line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_->dpi = _tmp4_;
 #line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_->dpi = _tmp4_;
+#line 858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = options;
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_->depth = 2;
-#line 3902 "ui.c"
+#line 3901 "ui.c"
 	} else {
 		ScanOptions* _tmp6_ = NULL;
 		ScanOptions* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
 		ScanOptions* _tmp9_ = NULL;
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = options;
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_->scan_mode = SCAN_MODE_COLOR;
 #line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_->scan_mode = SCAN_MODE_COLOR;
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = options;
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = user_interface_get_photo_dpi (self);
-#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_->dpi = _tmp8_;
 #line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp7_->dpi = _tmp8_;
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = options;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_->depth = 8;
-#line 3922 "ui.c"
+#line 3921 "ui.c"
 	}
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = options;
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = options;
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_get_paper_size (self, &_tmp12_, &_tmp13_);
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_->paper_width = _tmp12_;
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_->paper_height = _tmp13_;
 #line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp11_->paper_height = _tmp13_;
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = options;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = user_interface_get_brightness (self);
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = _tmp15_;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_->brightness = _tmp16_;
 #line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_->brightness = _tmp16_;
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = options;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = user_interface_get_contrast (self);
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = _tmp18_;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_->contrast = _tmp19_;
-#line 869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = options;
-#line 869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3954 "ui.c"
+#line 3953 "ui.c"
 }
 
 
@@ -3960,73 +3959,73 @@ static void user_interface_scan_button_clicked_cb (UserInterface* self, GtkWidge
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_make_scan_options (self);
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	options = _tmp0_;
 #line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	options->type = SCAN_TYPE_SINGLE;
+	options = _tmp0_;
 #line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	options->type = SCAN_TYPE_SINGLE;
+#line 878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_selected_device (self);
-#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "start-scan", _tmp3_, options);
-#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp3_);
-#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_options_unref0 (options);
-#line 3986 "ui.c"
+#line 3985 "ui.c"
 }
 
 
 static void _user_interface_scan_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_scan_button_clicked_cb ((UserInterface*) self, _sender);
-#line 3993 "ui.c"
+#line 3992 "ui.c"
 }
 
 
 static void user_interface_stop_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "stop-scan");
-#line 4004 "ui.c"
+#line 4003 "ui.c"
 }
 
 
 static void _user_interface_stop_scan_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_stop_scan_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4011 "ui.c"
+#line 4010 "ui.c"
 }
 
 
 static void user_interface_continuous_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_get_scanning (self);
-#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_;
-#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp1_) {
 #line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp1_) {
+#line 891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
-#line 4030 "ui.c"
+#line 4029 "ui.c"
 	} else {
 		ScanOptions* options = NULL;
 		ScanOptions* _tmp2_ = NULL;
@@ -4036,31 +4035,31 @@ static void user_interface_continuous_scan_button_clicked_cb (UserInterface* sel
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		ScanOptions* _tmp8_ = NULL;
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = user_interface_make_scan_options (self);
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		options = _tmp2_;
 #line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		options = _tmp2_;
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = options;
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = user_interface_get_page_side (self);
-#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_->type = _tmp4_;
 #line 895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_->type = _tmp4_;
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_selected_device (self);
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _tmp6_;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = options;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "start-scan", _tmp7_, _tmp8_);
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp7_);
-#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_scan_options_unref0 (options);
-#line 4064 "ui.c"
+#line 4063 "ui.c"
 	}
 }
 
@@ -4068,56 +4067,56 @@ static void user_interface_continuous_scan_button_clicked_cb (UserInterface* sel
 static void _user_interface_continuous_scan_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_continuous_scan_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4072 "ui.c"
+#line 4071 "ui.c"
 }
 
 
 static void user_interface_preferences_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
 	GtkDialog* _tmp0_ = NULL;
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present ((GtkWindow*) _tmp0_);
-#line 4086 "ui.c"
+#line 4085 "ui.c"
 }
 
 
 static void _user_interface_preferences_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_preferences_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4093 "ui.c"
+#line 4092 "ui.c"
 }
 
 
 void user_interface_preferences_activate_cb (UserInterface* self) {
 	GtkDialog* _tmp0_ = NULL;
-#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present ((GtkWindow*) _tmp0_);
-#line 4105 "ui.c"
+#line 4104 "ui.c"
 }
 
 
 static gboolean user_interface_preferences_dialog_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event) {
 	gboolean result = FALSE;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 4121 "ui.c"
+#line 4120 "ui.c"
 }
 
 
@@ -4126,35 +4125,35 @@ static gboolean _user_interface_preferences_dialog_delete_event_cb_gtk_widget_de
 	result = user_interface_preferences_dialog_delete_event_cb ((UserInterface*) self, _sender, event);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 4130 "ui.c"
+#line 4129 "ui.c"
 }
 
 
 static void user_interface_preferences_dialog_response_cb (UserInterface* self, GtkWidget* widget, gint response_id) {
 	GtkDialog* _tmp0_ = NULL;
-#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 4144 "ui.c"
+#line 4143 "ui.c"
 }
 
 
 static void _user_interface_preferences_dialog_response_cb_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_preferences_dialog_response_cb ((UserInterface*) self, _sender, response_id);
-#line 4151 "ui.c"
+#line 4150 "ui.c"
 }
 
 
 static gpointer _page_ref0 (gpointer self) {
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? page_ref (self) : NULL;
-#line 4158 "ui.c"
+#line 4157 "ui.c"
 }
 
 
@@ -4165,34 +4164,34 @@ static void user_interface_update_page_menu (UserInterface* self) {
 	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp3_;
 #line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page = _tmp3_;
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ == NULL) {
-#line 4185 "ui.c"
+#line 4184 "ui.c"
 		GtkMenuItem* _tmp5_ = NULL;
 		GtkMenuItem* _tmp6_ = NULL;
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->page_move_left_menuitem;
-#line 927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_sensitive ((GtkWidget*) _tmp5_, FALSE);
 #line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_widget_set_sensitive ((GtkWidget*) _tmp5_, FALSE);
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = self->priv->page_move_right_menuitem;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp6_, FALSE);
-#line 4196 "ui.c"
+#line 4195 "ui.c"
 	} else {
 		guint index = 0U;
 		Book* _tmp7_ = NULL;
@@ -4205,37 +4204,37 @@ static void user_interface_update_page_menu (UserInterface* self) {
 		Book* _tmp14_ = NULL;
 		guint _tmp15_ = 0U;
 		guint _tmp16_ = 0U;
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = self->priv->_book;
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = page;
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = book_get_page_index (_tmp7_, _tmp8_);
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		index = _tmp9_;
 #line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		index = _tmp9_;
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = self->priv->page_move_left_menuitem;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = index;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_sensitive ((GtkWidget*) _tmp10_, _tmp11_ > ((guint) 0));
 #line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_widget_set_sensitive ((GtkWidget*) _tmp10_, _tmp11_ > ((guint) 0));
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = self->priv->page_move_right_menuitem;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = index;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = self->priv->_book;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = book_get_n_pages (_tmp14_);
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = _tmp15_;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp12_, _tmp13_ < (_tmp16_ - 1));
-#line 4235 "ui.c"
+#line 4234 "ui.c"
 	}
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4239 "ui.c"
+#line 4238 "ui.c"
 }
 
 
@@ -4256,165 +4255,165 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 	Page* _tmp37_ = NULL;
 	gboolean _tmp38_ = FALSE;
 	gboolean _tmp39_ = FALSE;
-#line 938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp0_ == NULL) {
 #line 941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp0_ == NULL) {
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4270 "ui.c"
+#line 4269 "ui.c"
 	}
-#line 943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->updating_page_menu = TRUE;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->no_crop_menuitem;
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	menuitem = _tmp2_;
 #line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	menuitem = _tmp2_;
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_get_has_crop (_tmp3_);
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_) {
-#line 4290 "ui.c"
+#line 4289 "ui.c"
 		gchar* crop_name = NULL;
 		Page* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
-#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
-#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = page_get_crop_name (_tmp6_);
-#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_;
-#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = g_strdup (_tmp8_);
-#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		crop_name = _tmp9_;
 #line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		crop_name = _tmp9_;
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = crop_name;
-#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp10_ != NULL) {
-#line 4311 "ui.c"
+#line 4310 "ui.c"
 			const gchar* _tmp11_ = NULL;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = crop_name;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (g_strcmp0 (_tmp11_, "A4") == 0) {
-#line 4317 "ui.c"
+#line 4316 "ui.c"
 				GtkRadioMenuItem* _tmp12_ = NULL;
 				GtkRadioMenuItem* _tmp13_ = NULL;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = self->priv->a4_menuitem;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (menuitem);
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				menuitem = _tmp13_;
-#line 4328 "ui.c"
+#line 4327 "ui.c"
 			} else {
 				const gchar* _tmp14_ = NULL;
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp14_ = crop_name;
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (g_strcmp0 (_tmp14_, "A5") == 0) {
-#line 4335 "ui.c"
+#line 4334 "ui.c"
 					GtkRadioMenuItem* _tmp15_ = NULL;
 					GtkRadioMenuItem* _tmp16_ = NULL;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp15_ = self->priv->a5_menuitem;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (menuitem);
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					menuitem = _tmp16_;
-#line 4346 "ui.c"
+#line 4345 "ui.c"
 				} else {
 					const gchar* _tmp17_ = NULL;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp17_ = crop_name;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (g_strcmp0 (_tmp17_, "A6") == 0) {
-#line 4353 "ui.c"
+#line 4352 "ui.c"
 						GtkRadioMenuItem* _tmp18_ = NULL;
 						GtkRadioMenuItem* _tmp19_ = NULL;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp18_ = self->priv->a6_menuitem;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_g_object_unref0 (menuitem);
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						menuitem = _tmp19_;
-#line 4364 "ui.c"
+#line 4363 "ui.c"
 					} else {
 						const gchar* _tmp20_ = NULL;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp20_ = crop_name;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						if (g_strcmp0 (_tmp20_, "letter") == 0) {
-#line 4371 "ui.c"
+#line 4370 "ui.c"
 							GtkRadioMenuItem* _tmp21_ = NULL;
 							GtkRadioMenuItem* _tmp22_ = NULL;
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp21_ = self->priv->letter_menuitem;
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp22_ = _g_object_ref0 (_tmp21_);
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_object_unref0 (menuitem);
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							menuitem = _tmp22_;
-#line 4382 "ui.c"
+#line 4381 "ui.c"
 						} else {
 							const gchar* _tmp23_ = NULL;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp23_ = crop_name;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (g_strcmp0 (_tmp23_, "legal") == 0) {
-#line 4389 "ui.c"
+#line 4388 "ui.c"
 								GtkRadioMenuItem* _tmp24_ = NULL;
 								GtkRadioMenuItem* _tmp25_ = NULL;
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp24_ = self->priv->legal_menuitem;
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp25_ = _g_object_ref0 (_tmp24_);
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_g_object_unref0 (menuitem);
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								menuitem = _tmp25_;
-#line 4400 "ui.c"
+#line 4399 "ui.c"
 							} else {
 								const gchar* _tmp26_ = NULL;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp26_ = crop_name;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								if (g_strcmp0 (_tmp26_, "4x6") == 0) {
-#line 4407 "ui.c"
+#line 4406 "ui.c"
 									GtkRadioMenuItem* _tmp27_ = NULL;
 									GtkRadioMenuItem* _tmp28_ = NULL;
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									_tmp27_ = self->priv->four_by_six_menuitem;
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									_g_object_unref0 (menuitem);
-#line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									menuitem = _tmp28_;
-#line 4418 "ui.c"
+#line 4417 "ui.c"
 								}
 							}
 						}
@@ -4424,49 +4423,49 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 		} else {
 			GtkRadioMenuItem* _tmp29_ = NULL;
 			GtkRadioMenuItem* _tmp30_ = NULL;
-#line 967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp29_ = self->priv->custom_crop_menuitem;
-#line 967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp30_ = _g_object_ref0 (_tmp29_);
-#line 967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (menuitem);
-#line 967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			menuitem = _tmp30_;
-#line 4436 "ui.c"
+#line 4435 "ui.c"
 		}
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (crop_name);
-#line 4440 "ui.c"
+#line 4439 "ui.c"
 	}
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = menuitem;
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp31_, TRUE);
 #line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp31_, TRUE);
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = self->priv->crop_button;
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = page;
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp34_ = page_get_has_crop (_tmp33_);
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = _tmp34_;
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_toggle_button_set_active (_tmp32_, _tmp35_);
 #line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_toggle_button_set_active (_tmp32_, _tmp35_);
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp36_ = self->priv->crop_toolbutton;
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp37_ = page;
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp38_ = page_get_has_crop (_tmp37_);
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp39_ = _tmp38_;
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_toggle_tool_button_set_active (_tmp36_, _tmp39_);
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->updating_page_menu = FALSE;
-#line 938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (menuitem);
-#line 4470 "ui.c"
+#line 4469 "ui.c"
 }
 
 
@@ -4478,51 +4477,51 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 	const gchar* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = get_temporary_filename ("scanned-page", "tiff");
-#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	path = _tmp0_;
 #line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	path = _tmp0_;
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = path;
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp1_ == NULL) {
 #line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp1_ == NULL) {
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4500 "ui.c"
+#line 4499 "ui.c"
 	}
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = path;
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_file_new_for_path (_tmp2_);
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file = _tmp3_;
-#line 4508 "ui.c"
+#line 4507 "ui.c"
 	{
 		Page* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		GFile* _tmp7_ = NULL;
-#line 986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = page;
-#line 986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_quality (self);
-#line 986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = file;
-#line 986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_save (_tmp4_, "tiff", _tmp6_, _tmp7_, &_inner_error_);
-#line 986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4526 "ui.c"
+#line 4525 "ui.c"
 			goto __catch18_g_error;
 		}
 	}
@@ -4533,42 +4532,42 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		const gchar* _tmp8_ = NULL;
 		GError* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _ ("Unable to save image for preview");
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = e;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = _tmp9_->message;
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp8_, _tmp10_);
-#line 993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4557 "ui.c"
+#line 4556 "ui.c"
 	}
 	__finally18:
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4572 "ui.c"
+#line 4571 "ui.c"
 	}
 	{
 		GdkScreen* _tmp11_ = NULL;
@@ -4577,25 +4576,25 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
 		guint32 _tmp16_ = 0U;
-#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = gtk_window_get_screen ((GtkWindow*) self);
-#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = _tmp11_;
-#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = file;
-#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = g_file_get_uri (_tmp13_);
-#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = _tmp14_;
-#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = gtk_get_current_event_time ();
-#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_show_uri (_tmp12_, _tmp15_, _tmp16_, &_inner_error_);
-#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp15_);
-#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4599 "ui.c"
+#line 4598 "ui.c"
 			goto __catch19_g_error;
 		}
 	}
@@ -4606,59 +4605,59 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		const gchar* _tmp17_ = NULL;
 		GError* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = _ ("Unable to open image preview application");
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp18_ = e;
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = _tmp18_->message;
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp17_, _tmp19_);
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 4624 "ui.c"
+#line 4623 "ui.c"
 	}
 	__finally19:
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4639 "ui.c"
+#line 4638 "ui.c"
 	}
-#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file);
-#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (path);
-#line 4645 "ui.c"
+#line 4644 "ui.c"
 }
 
 
 static void user_interface_show_page_menu_cb (UserInterface* self, BookView* view) {
 	GtkMenu* _tmp0_ = NULL;
 	guint32 _tmp1_ = 0U;
-#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 1010 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_menu;
-#line 1010 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_get_current_event_time ();
-#line 1010 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, (guint) 3, _tmp1_);
-#line 4662 "ui.c"
+#line 4661 "ui.c"
 }
 
 
@@ -4670,50 +4669,50 @@ static void user_interface_rotate_left_button_clicked_cb (UserInterface* self, G
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp0_) {
 #line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp0_) {
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4684 "ui.c"
+#line 4683 "ui.c"
 	}
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_view_get_selected_page (_tmp1_);
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _page_ref0 (_tmp3_);
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp4_;
 #line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page = _tmp4_;
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ != NULL) {
-#line 4700 "ui.c"
+#line 4699 "ui.c"
 		Page* _tmp6_ = NULL;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_rotate_left (_tmp6_);
-#line 4706 "ui.c"
+#line 4705 "ui.c"
 	}
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4710 "ui.c"
+#line 4709 "ui.c"
 }
 
 
 static void _user_interface_rotate_left_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_rotate_left_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4717 "ui.c"
+#line 4716 "ui.c"
 }
 
 
@@ -4725,50 +4724,50 @@ static void user_interface_rotate_right_button_clicked_cb (UserInterface* self,
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp0_) {
 #line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp0_) {
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4739 "ui.c"
+#line 4738 "ui.c"
 	}
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_view_get_selected_page (_tmp1_);
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _page_ref0 (_tmp3_);
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp4_;
 #line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page = _tmp4_;
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ != NULL) {
-#line 4755 "ui.c"
+#line 4754 "ui.c"
 		Page* _tmp6_ = NULL;
-#line 1030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
-#line 1030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_rotate_right (_tmp6_);
-#line 4761 "ui.c"
+#line 4760 "ui.c"
 	}
-#line 1024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4765 "ui.c"
+#line 4764 "ui.c"
 }
 
 
 static void _user_interface_rotate_right_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_rotate_right_button_clicked_cb ((UserInterface*) self, _sender);
-#line 4772 "ui.c"
+#line 4771 "ui.c"
 }
 
 
@@ -4783,62 +4782,62 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 	Page* _tmp6_ = NULL;
 	Page* _tmp7_ = NULL;
 	const gchar* _tmp8_ = NULL;
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->crop_rotate_menuitem;
-#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = crop_name;
-#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp1_ != NULL);
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->updating_page_menu;
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
 #line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4801 "ui.c"
+#line 4800 "ui.c"
 	}
-#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book_view;
-#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book_view_get_selected_page (_tmp3_);
-#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _page_ref0 (_tmp5_);
-#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp6_;
 #line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page = _tmp6_;
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = page;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ == NULL) {
-#line 1043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1043: Trying to set crop but no selected page");
 #line 1044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:1044: Trying to set crop but no selected page");
+#line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (page);
-#line 1044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4823 "ui.c"
+#line 4822 "ui.c"
 	}
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = crop_name;
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp8_ == NULL) {
-#line 4829 "ui.c"
+#line 4828 "ui.c"
 		Page* _tmp9_ = NULL;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = page;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_set_no_crop (_tmp9_);
-#line 4835 "ui.c"
+#line 4834 "ui.c"
 	} else {
 		const gchar* _tmp10_ = NULL;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = crop_name;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (g_strcmp0 (_tmp10_, "custom") == 0) {
-#line 4842 "ui.c"
+#line 4841 "ui.c"
 			gint width = 0;
 			Page* _tmp11_ = NULL;
 			gint _tmp12_ = 0;
@@ -4859,66 +4858,66 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 			gint _tmp24_ = 0;
 			gint _tmp25_ = 0;
 			gint _tmp26_ = 0;
-#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = page;
-#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp12_ = page_get_width (_tmp11_);
-#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp13_ = _tmp12_;
-#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			width = _tmp13_;
 #line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			width = _tmp13_;
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp14_ = page;
-#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp15_ = page_get_height (_tmp14_);
-#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp16_ = _tmp15_;
-#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			height = _tmp16_;
 #line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			height = _tmp16_;
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp17_ = width;
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			crop_width = (gint) ((_tmp17_ * 0.8) + 0.5);
 #line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			crop_width = (gint) ((_tmp17_ * 0.8) + 0.5);
+#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp18_ = height;
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			crop_height = (gint) ((_tmp18_ * 0.8) + 0.5);
 #line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			crop_height = (gint) ((_tmp18_ * 0.8) + 0.5);
+#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp19_ = page;
-#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp20_ = crop_width;
-#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp21_ = crop_height;
-#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			page_set_custom_crop (_tmp19_, _tmp20_, _tmp21_);
 #line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			page_set_custom_crop (_tmp19_, _tmp20_, _tmp21_);
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp22_ = page;
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp23_ = width;
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp24_ = crop_width;
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp25_ = height;
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp26_ = crop_height;
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_move_crop (_tmp22_, (_tmp23_ - _tmp24_) / 2, (_tmp25_ - _tmp26_) / 2);
-#line 4907 "ui.c"
+#line 4906 "ui.c"
 		} else {
 			Page* _tmp27_ = NULL;
 			const gchar* _tmp28_ = NULL;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp27_ = page;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp28_ = crop_name;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_set_named_crop (_tmp27_, _tmp28_);
-#line 4917 "ui.c"
+#line 4916 "ui.c"
 		}
 	}
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4922 "ui.c"
+#line 4921 "ui.c"
 }
 
 
@@ -4926,21 +4925,21 @@ static void user_interface_no_crop_menuitem_toggled_cb (UserInterface* self, Gtk
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
 #line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, NULL);
-#line 4944 "ui.c"
+#line 4943 "ui.c"
 	}
 }
 
@@ -4948,7 +4947,7 @@ static void user_interface_no_crop_menuitem_toggled_cb (UserInterface* self, Gtk
 static void _user_interface_no_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_no_crop_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 4952 "ui.c"
+#line 4951 "ui.c"
 }
 
 
@@ -4956,21 +4955,21 @@ static void user_interface_custom_crop_menuitem_toggled_cb (UserInterface* self,
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
 #line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 1074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "custom");
-#line 4974 "ui.c"
+#line 4973 "ui.c"
 	}
 }
 
@@ -4978,7 +4977,7 @@ static void user_interface_custom_crop_menuitem_toggled_cb (UserInterface* self,
 static void _user_interface_custom_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_custom_crop_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 4982 "ui.c"
+#line 4981 "ui.c"
 }
 
 
@@ -4987,40 +4986,40 @@ static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggl
 	GtkToggleButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 1077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp0_) {
 #line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp0_) {
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5001 "ui.c"
+#line 5000 "ui.c"
 	}
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = widget;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_toggle_button_get_active (_tmp1_);
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 5011 "ui.c"
+#line 5010 "ui.c"
 		GtkRadioMenuItem* _tmp4_ = NULL;
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->custom_crop_menuitem;
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 5017 "ui.c"
+#line 5016 "ui.c"
 	} else {
 		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->no_crop_menuitem;
-#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
-#line 5024 "ui.c"
+#line 5023 "ui.c"
 	}
 }
 
@@ -5028,7 +5027,7 @@ static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggl
 static void _user_interface_crop_button_toggled_cb_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_crop_button_toggled_cb ((UserInterface*) self, _sender);
-#line 5032 "ui.c"
+#line 5031 "ui.c"
 }
 
 
@@ -5037,40 +5036,40 @@ static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkT
 	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 1089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp0_) {
 #line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp0_) {
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5051 "ui.c"
+#line 5050 "ui.c"
 	}
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = widget;
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 5061 "ui.c"
+#line 5060 "ui.c"
 		GtkRadioMenuItem* _tmp4_ = NULL;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->custom_crop_menuitem;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 5067 "ui.c"
+#line 5066 "ui.c"
 	} else {
 		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->no_crop_menuitem;
-#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
-#line 5074 "ui.c"
+#line 5073 "ui.c"
 	}
 }
 
@@ -5078,7 +5077,7 @@ static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkT
 static void _user_interface_crop_toolbutton_toggled_cb_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_crop_toolbutton_toggled_cb ((UserInterface*) self, _sender);
-#line 5082 "ui.c"
+#line 5081 "ui.c"
 }
 
 
@@ -5086,21 +5085,21 @@ static void user_interface_four_by_six_menuitem_toggled_cb (UserInterface* self,
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
 #line 1104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 1105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "4x6");
-#line 5104 "ui.c"
+#line 5103 "ui.c"
 	}
 }
 
@@ -5108,7 +5107,7 @@ static void user_interface_four_by_six_menuitem_toggled_cb (UserInterface* self,
 static void _user_interface_four_by_six_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_four_by_six_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5112 "ui.c"
+#line 5111 "ui.c"
 }
 
 
@@ -5116,21 +5115,21 @@ static void user_interface_legal_menuitem_toggled_cb (UserInterface* self, GtkCh
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
 #line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "legal");
-#line 5134 "ui.c"
+#line 5133 "ui.c"
 	}
 }
 
@@ -5138,7 +5137,7 @@ static void user_interface_legal_menuitem_toggled_cb (UserInterface* self, GtkCh
 static void _user_interface_legal_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_legal_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5142 "ui.c"
+#line 5141 "ui.c"
 }
 
 
@@ -5146,21 +5145,21 @@ static void user_interface_letter_menuitem_toggled_cb (UserInterface* self, GtkC
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
 #line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 1119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "letter");
-#line 5164 "ui.c"
+#line 5163 "ui.c"
 	}
 }
 
@@ -5168,7 +5167,7 @@ static void user_interface_letter_menuitem_toggled_cb (UserInterface* self, GtkC
 static void _user_interface_letter_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_letter_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5172 "ui.c"
+#line 5171 "ui.c"
 }
 
 
@@ -5176,21 +5175,21 @@ static void user_interface_a6_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
 #line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 1126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A6");
-#line 5194 "ui.c"
+#line 5193 "ui.c"
 	}
 }
 
@@ -5198,7 +5197,7 @@ static void user_interface_a6_menuitem_toggled_cb (UserInterface* self, GtkCheck
 static void _user_interface_a6_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_a6_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5202 "ui.c"
+#line 5201 "ui.c"
 }
 
 
@@ -5206,21 +5205,21 @@ static void user_interface_a5_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
 #line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A5");
-#line 5224 "ui.c"
+#line 5223 "ui.c"
 	}
 }
 
@@ -5228,7 +5227,7 @@ static void user_interface_a5_menuitem_toggled_cb (UserInterface* self, GtkCheck
 static void _user_interface_a5_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_a5_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5232 "ui.c"
+#line 5231 "ui.c"
 }
 
 
@@ -5236,21 +5235,21 @@ static void user_interface_a4_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
 #line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 1140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A4");
-#line 5254 "ui.c"
+#line 5253 "ui.c"
 	}
 }
 
@@ -5258,7 +5257,7 @@ static void user_interface_a4_menuitem_toggled_cb (UserInterface* self, GtkCheck
 static void _user_interface_a4_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_a4_menuitem_toggled_cb ((UserInterface*) self, _sender);
-#line 5262 "ui.c"
+#line 5261 "ui.c"
 }
 
 
@@ -5270,44 +5269,44 @@ static void user_interface_crop_rotate_menuitem_activate_cb (UserInterface* self
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp3_;
 #line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page = _tmp3_;
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp4_ == NULL) {
 #line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp4_ == NULL) {
+#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (page);
-#line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5296 "ui.c"
+#line 5295 "ui.c"
 	}
-#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_rotate_crop (_tmp5_);
-#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5304 "ui.c"
+#line 5303 "ui.c"
 }
 
 
 static void _user_interface_crop_rotate_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_crop_rotate_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5311 "ui.c"
+#line 5310 "ui.c"
 }
 
 
@@ -5322,56 +5321,56 @@ static void user_interface_page_move_left_menuitem_activate_cb (UserInterface* s
 	Page* _tmp5_ = NULL;
 	guint _tmp6_ = 0U;
 	guint _tmp7_ = 0U;
-#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp3_;
 #line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page = _tmp3_;
+#line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->_book;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_page_index (_tmp4_, _tmp5_);
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	index = _tmp6_;
 #line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	index = _tmp6_;
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = index;
-#line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ > ((guint) 0)) {
-#line 5352 "ui.c"
+#line 5351 "ui.c"
 		Book* _tmp8_ = NULL;
 		Page* _tmp9_ = NULL;
 		guint _tmp10_ = 0U;
-#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = self->priv->_book;
-#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = page;
-#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = index;
-#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_move_page (_tmp8_, _tmp9_, _tmp10_ - 1);
-#line 5364 "ui.c"
+#line 5363 "ui.c"
 	}
-#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5368 "ui.c"
+#line 5367 "ui.c"
 }
 
 
 static void _user_interface_page_move_left_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_move_left_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5375 "ui.c"
+#line 5374 "ui.c"
 }
 
 
@@ -5389,68 +5388,68 @@ static void user_interface_page_move_right_menuitem_activate_cb (UserInterface*
 	Book* _tmp8_ = NULL;
 	guint _tmp9_ = 0U;
 	guint _tmp10_ = 0U;
-#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp3_;
 #line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page = _tmp3_;
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->_book;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_page_index (_tmp4_, _tmp5_);
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	index = _tmp6_;
 #line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	index = _tmp6_;
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = index;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->_book;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = book_get_n_pages (_tmp8_);
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = _tmp9_;
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ < (_tmp10_ - 1)) {
-#line 5425 "ui.c"
+#line 5424 "ui.c"
 		Book* _tmp11_ = NULL;
 		Page* _tmp12_ = NULL;
 		Book* _tmp13_ = NULL;
 		Page* _tmp14_ = NULL;
 		guint _tmp15_ = 0U;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = self->priv->_book;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = page;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = self->priv->_book;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = page;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = book_get_page_index (_tmp13_, _tmp14_);
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_move_page (_tmp11_, _tmp12_, _tmp15_ + 1);
-#line 5443 "ui.c"
+#line 5442 "ui.c"
 	}
-#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5447 "ui.c"
+#line 5446 "ui.c"
 }
 
 
 static void _user_interface_page_move_right_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_move_right_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5454 "ui.c"
+#line 5453 "ui.c"
 }
 
 
@@ -5461,60 +5460,60 @@ static void user_interface_page_delete_menuitem_activate_cb (UserInterface* self
 	BookView* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_book (_tmp0_);
-#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book_view;
-#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book_view_get_selected_page (_tmp3_);
-#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_delete_page (_tmp2_, _tmp5_);
-#line 5483 "ui.c"
+#line 5482 "ui.c"
 }
 
 
 static void _user_interface_page_delete_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_delete_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5490 "ui.c"
+#line 5489 "ui.c"
 }
 
 
 static Block2Data* block2_data_ref (Block2Data* _data2_) {
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_atomic_int_inc (&_data2_->_ref_count_);
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return _data2_;
-#line 5499 "ui.c"
+#line 5498 "ui.c"
 }
 
 
 static void block2_data_unref (void * _userdata_) {
 	Block2Data* _data2_;
 	_data2_ = (Block2Data*) _userdata_;
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) {
-#line 5508 "ui.c"
+#line 5507 "ui.c"
 		UserInterface* self;
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self = _data2_->self;
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data2_->dialog);
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (self);
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_slice_free (Block2Data, _data2_);
-#line 5518 "ui.c"
+#line 5517 "ui.c"
 	}
 }
 
@@ -5525,138 +5524,138 @@ static gboolean __lambda6_ (Block2Data* _data2_, GdkEventKey* e) {
 	gboolean _tmp0_ = FALSE;
 	GdkEventKey* _tmp1_ = NULL;
 	GdkModifierType _tmp2_ = 0;
-#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data2_->self;
-#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (e != NULL, FALSE);
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = e;
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_->state;
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_ == 0) {
-#line 5539 "ui.c"
+#line 5538 "ui.c"
 		GdkEventKey* _tmp3_ = NULL;
 		guint _tmp4_ = 0U;
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = e;
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = _tmp3_->keyval;
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_ == ((guint) GDK_KEY_Escape);
-#line 5548 "ui.c"
+#line 5547 "ui.c"
 	} else {
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = FALSE;
-#line 5552 "ui.c"
+#line 5551 "ui.c"
 	}
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
 #line 1189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
+#line 1190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
-#line 1189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 5562 "ui.c"
+#line 5561 "ui.c"
 	}
-#line 1192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5568 "ui.c"
+#line 5567 "ui.c"
 }
 
 
 static gboolean ___lambda6__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
 	result = __lambda6_ (self, event);
-#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5577 "ui.c"
+#line 5576 "ui.c"
 }
 
 
 static void __lambda7_ (Block2Data* _data2_) {
 	UserInterface* self;
 	Book* _tmp0_ = NULL;
-#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data2_->self;
-#line 1208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 1208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_combine_sides (_tmp0_);
 #line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	book_combine_sides (_tmp0_);
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5592 "ui.c"
+#line 5591 "ui.c"
 }
 
 
 static void ___lambda7__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda7_ (self);
-#line 5599 "ui.c"
+#line 5598 "ui.c"
 }
 
 
 static void __lambda8_ (Block2Data* _data2_) {
 	UserInterface* self;
 	Book* _tmp0_ = NULL;
-#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data2_->self;
-#line 1218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 1218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_combine_sides_reverse (_tmp0_);
 #line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	book_combine_sides_reverse (_tmp0_);
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5614 "ui.c"
+#line 5613 "ui.c"
 }
 
 
 static void ___lambda8__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda8_ (self);
-#line 5621 "ui.c"
+#line 5620 "ui.c"
 }
 
 
 static void __lambda9_ (Block2Data* _data2_) {
 	UserInterface* self;
 	Book* _tmp0_ = NULL;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data2_->self;
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_reverse (_tmp0_);
 #line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	book_reverse (_tmp0_);
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5636 "ui.c"
+#line 5635 "ui.c"
 }
 
 
 static void ___lambda9__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda9_ (self);
-#line 5643 "ui.c"
+#line 5642 "ui.c"
 }
 
 
 static void __lambda10_ (Block2Data* _data2_) {
 	UserInterface* self;
-#line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data2_->self;
-#line 1238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
-#line 5653 "ui.c"
+#line 5652 "ui.c"
 }
 
 
 static void ___lambda10__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda10_ (self);
-#line 5660 "ui.c"
+#line 5659 "ui.c"
 }
 
 
@@ -5687,170 +5686,170 @@ static void user_interface_reorder_document (UserInterface* self) {
 	GtkButton* _tmp20_ = NULL;
 	GtkButton* _tmp21_ = NULL;
 	GtkButton* _tmp22_ = NULL;
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data2_ = g_slice_new0 (Block2Data);
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data2_->_ref_count_ = 1;
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data2_->self = g_object_ref (self);
-#line 1177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkWindow*) gtk_window_new (GTK_WINDOW_TOPLEVEL);
-#line 1177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data2_->dialog = _tmp0_;
 #line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_type_hint (_data2_->dialog, GDK_WINDOW_TYPE_HINT_DIALOG);
+	_data2_->dialog = _tmp0_;
 #line 1179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_modal (_data2_->dialog, TRUE);
+	gtk_window_set_type_hint (_data2_->dialog, GDK_WINDOW_TYPE_HINT_DIALOG);
 #line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_modal (_data2_->dialog, TRUE);
+#line 1181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_set_border_width ((GtkContainer*) _data2_->dialog, (guint) 12);
-#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Reorder Pages");
-#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_title (_data2_->dialog, _tmp1_);
 #line 1183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_transient_for (_data2_->dialog, (GtkWindow*) self);
+	gtk_window_set_title (_data2_->dialog, _tmp1_);
 #line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_transient_for (_data2_->dialog, (GtkWindow*) self);
+#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_data ((GtkWidget*) _data2_->dialog, "key-press-event", (GCallback) ___lambda6__gtk_widget_key_press_event, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _data2_->dialog, TRUE);
-#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = (GtkGrid*) gtk_grid_new ();
-#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp2_);
-#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g = _tmp2_;
 #line 1197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_grid_set_row_homogeneous (g, TRUE);
+	g = _tmp2_;
 #line 1198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_grid_set_row_spacing (g, 6);
+	gtk_grid_set_row_homogeneous (g, TRUE);
 #line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_grid_set_column_homogeneous (g, TRUE);
+	gtk_grid_set_row_spacing (g, 6);
 #line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_grid_set_column_spacing (g, 6);
+	gtk_grid_set_column_homogeneous (g, TRUE);
 #line 1201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) g, TRUE);
+	gtk_grid_set_column_spacing (g, 6);
 #line 1202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) g, TRUE);
+#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) _data2_->dialog, (GtkWidget*) g);
-#line 1205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _ ("Combine sides");
-#line 1205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = user_interface_make_reorder_button (self, _tmp3_, "F1F2F3B1B2B3-F1B1F2B2F3B3");
-#line 1205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	b = _tmp4_;
 #line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	b = _tmp4_;
+#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = b;
-#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_data (_tmp5_, "clicked", (GCallback) ___lambda7__gtk_button_clicked, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
-#line 1211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = b;
-#line 1211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp6_, TRUE);
 #line 1212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp6_, TRUE);
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = b;
-#line 1212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp7_, 0, 0, 1, 1);
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("Combine sides (reverse)");
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = user_interface_make_reorder_button (self, _tmp8_, "F1F2F3B3B2B1-F1B1F2B2F3B3");
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	b = _tmp9_;
 #line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	b = _tmp9_;
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = b;
-#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_data (_tmp10_, "clicked", (GCallback) ___lambda8__gtk_button_clicked, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
-#line 1221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = b;
-#line 1221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
 #line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
+#line 1223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = b;
-#line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp12_, 1, 0, 1, 1);
-#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = _ ("Reverse");
-#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = user_interface_make_reorder_button (self, _tmp13_, "C1C2C3C4C5C6-C6C5C4C3C2C1");
-#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	b = _tmp14_;
 #line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	b = _tmp14_;
+#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = b;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_data (_tmp15_, "clicked", (GCallback) ___lambda9__gtk_button_clicked, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
-#line 1231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = b;
-#line 1231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp16_, TRUE);
 #line 1232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp16_, TRUE);
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = b;
-#line 1232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp17_, 0, 2, 1, 1);
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = _ ("Keep unchanged");
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = user_interface_make_reorder_button (self, _tmp18_, "C1C2C3C4C5C6-C1C2C3C4C5C6");
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	b = _tmp19_;
 #line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	b = _tmp19_;
+#line 1237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = b;
-#line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_data (_tmp20_, "clicked", (GCallback) ___lambda10__gtk_button_clicked, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0);
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = b;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp21_, TRUE);
 #line 1241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp21_, TRUE);
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = b;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp22_, 1, 2, 1, 1);
-#line 1243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present (_data2_->dialog);
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (g);
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	block2_data_unref (_data2_);
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data2_ = NULL;
-#line 5827 "ui.c"
+#line 5826 "ui.c"
 }
 
 
 void user_interface_reorder_document_activate_cb (UserInterface* self) {
-#line 1246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_document (self);
-#line 5836 "ui.c"
+#line 5835 "ui.c"
 }
 
 
 static void user_interface_reorder_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_document (self);
-#line 5847 "ui.c"
+#line 5846 "ui.c"
 }
 
 
 static void _user_interface_reorder_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 5854 "ui.c"
+#line 5853 "ui.c"
 }
 
 
@@ -5866,61 +5865,61 @@ static GtkButton* user_interface_make_reorder_button (UserInterface* self, const
 	GtkBox* rb = NULL;
 	const gchar* _tmp4_ = NULL;
 	GtkBox* _tmp5_ = NULL;
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (text != NULL, NULL);
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (items != NULL, NULL);
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkButton*) gtk_button_new ();
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp0_;
-#line 1261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-#line 1261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	vbox = _tmp1_;
 #line 1262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) vbox, TRUE);
+	vbox = _tmp1_;
 #line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) vbox, TRUE);
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) b, (GtkWidget*) vbox);
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = text;
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = (GtkLabel*) gtk_label_new (_tmp2_);
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	label = _tmp3_;
 #line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) label, TRUE);
+	label = _tmp3_;
 #line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) label, TRUE);
+#line 1268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) label, TRUE, TRUE, (guint) 0);
-#line 1269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = items;
-#line 1269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = user_interface_make_reorder_box (self, _tmp4_);
-#line 1269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	rb = _tmp5_;
 #line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) rb, TRUE);
+	rb = _tmp5_;
 #line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) rb, TRUE);
+#line 1272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) rb, TRUE, TRUE, (guint) 0);
-#line 1273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = b;
-#line 1273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (rb);
-#line 1273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (label);
-#line 1273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (vbox);
-#line 1273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5924 "ui.c"
+#line 5923 "ui.c"
 }
 
 
@@ -5938,7 +5937,7 @@ static gchar string_get (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	return result;
-#line 5942 "ui.c"
+#line 5941 "ui.c"
 }
 
 
@@ -5948,35 +5947,35 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 	GtkBox* _tmp0_ = NULL;
 	GtkBox* _tmp1_ = NULL;
 	GtkBox* page_box = NULL;
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (items != NULL, NULL);
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	box = _tmp0_;
 #line 1279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	box = _tmp0_;
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = box;
-#line 1279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp1_, TRUE);
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_box = NULL;
-#line 5968 "ui.c"
+#line 5967 "ui.c"
 	{
 		gint i = 0;
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		i = 0;
-#line 5973 "ui.c"
+#line 5972 "ui.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp2_ = TRUE;
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 5980 "ui.c"
+#line 5979 "ui.c"
 				const gchar* _tmp4_ = NULL;
 				gint _tmp5_ = 0;
 				gchar _tmp6_ = '\0';
@@ -6016,164 +6015,164 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 				PageIcon* _tmp49_ = NULL;
 				GtkBox* _tmp50_ = NULL;
 				PageIcon* _tmp51_ = NULL;
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp2_) {
-#line 6022 "ui.c"
+#line 6021 "ui.c"
 					gint _tmp3_ = 0;
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp3_ = i;
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					i = _tmp3_ + 1;
-#line 6028 "ui.c"
+#line 6027 "ui.c"
 				}
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp2_ = FALSE;
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp4_ = items;
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp5_ = i;
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp6_ = string_get (_tmp4_, (glong) _tmp5_);
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!(_tmp6_ != '\0')) {
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 6042 "ui.c"
+#line 6041 "ui.c"
 				}
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = items;
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = i;
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = string_get (_tmp7_, (glong) _tmp8_);
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp9_ == '-') {
-#line 6052 "ui.c"
+#line 6051 "ui.c"
 					GtkArrow* a = NULL;
 					GtkArrow* _tmp10_ = NULL;
 					GtkArrow* _tmp11_ = NULL;
 					GtkBox* _tmp12_ = NULL;
 					GtkArrow* _tmp13_ = NULL;
-#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp10_ = (GtkArrow*) gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
-#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					g_object_ref_sink (_tmp10_);
-#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					a = _tmp10_;
 #line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					a = _tmp10_;
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp11_ = a;
-#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
 #line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
+#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp12_ = box;
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp13_ = a;
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_box_pack_start (_tmp12_, (GtkWidget*) _tmp13_, FALSE, FALSE, (guint) 0);
 #line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gtk_box_pack_start (_tmp12_, (GtkWidget*) _tmp13_, FALSE, FALSE, (guint) 0);
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (page_box);
-#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					page_box = NULL;
 #line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					page_box = NULL;
+#line 1291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (a);
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					continue;
-#line 6082 "ui.c"
+#line 6081 "ui.c"
 				}
-#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp14_ = items;
-#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp15_ = i;
-#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp16_ = string_get (_tmp14_, (glong) _tmp15_);
-#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				side = _tmp16_;
 #line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				side = _tmp16_;
+#line 1296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp17_ = i;
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				i = _tmp17_ + 1;
 #line 1296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				i = _tmp17_ + 1;
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp18_ = items;
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp19_ = i;
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp20_ = string_get (_tmp18_, (glong) _tmp19_);
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp20_ == '\0') {
 #line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (_tmp20_ == '\0') {
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 6106 "ui.c"
+#line 6105 "ui.c"
 				}
-#line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = page_box;
-#line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp21_ == NULL) {
-#line 6112 "ui.c"
+#line 6111 "ui.c"
 					GtkBox* _tmp22_ = NULL;
 					GtkBox* _tmp23_ = NULL;
 					GtkBox* _tmp24_ = NULL;
 					GtkBox* _tmp25_ = NULL;
-#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					g_object_ref_sink (_tmp22_);
-#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (page_box);
-#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					page_box = _tmp22_;
 #line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					page_box = _tmp22_;
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp23_ = page_box;
-#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_widget_set_visible ((GtkWidget*) _tmp23_, TRUE);
 #line 1303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gtk_widget_set_visible ((GtkWidget*) _tmp23_, TRUE);
+#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp24_ = box;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp25_ = page_box;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_box_pack_start (_tmp24_, (GtkWidget*) _tmp25_, FALSE, FALSE, (guint) 0);
-#line 6135 "ui.c"
+#line 6134 "ui.c"
 				}
-#line 1307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				r = 1.0;
 #line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				g = 1.0;
+				r = 1.0;
 #line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				b = 1.0;
+				g = 1.0;
 #line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				b = 1.0;
+#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp26_ = side;
-#line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				switch (_tmp26_) {
-#line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'F':
-#line 6149 "ui.c"
+#line 6148 "ui.c"
 					{
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						r = 0x75 / 255.0;
 #line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						g = 0x50 / 255.0;
+						r = 0x75 / 255.0;
 #line 1316 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						b = 0x7B / 255.0;
+						g = 0x50 / 255.0;
 #line 1317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						b = 0x7B / 255.0;
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 6159 "ui.c"
+#line 6158 "ui.c"
 					}
-#line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'B':
-#line 6163 "ui.c"
+#line 6162 "ui.c"
 					{
-#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						r = 0xF5 / 255.0;
 #line 1321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						g = 0x79 / 255.0;
+						r = 0xF5 / 255.0;
 #line 1322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						b = 0.0;
+						g = 0x79 / 255.0;
 #line 1323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						b = 0.0;
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 6173 "ui.c"
+#line 6172 "ui.c"
 					}
-#line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'C':
-#line 6177 "ui.c"
+#line 6176 "ui.c"
 					{
 						gdouble p = 0.0;
 						const gchar* _tmp27_ = NULL;
@@ -6182,129 +6181,129 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 						gdouble _tmp30_ = 0.0;
 						gdouble _tmp31_ = 0.0;
 						gdouble _tmp32_ = 0.0;
-#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp27_ = items;
-#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp28_ = i;
-#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp29_ = string_get (_tmp27_, (glong) _tmp28_);
-#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						p = (_tmp29_ - '1') / 5.0;
 #line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						p = (_tmp29_ - '1') / 5.0;
+#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp30_ = p;
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp31_ = p;
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						r = ((0xED / 255.0) * (1 - _tmp30_)) + (0xCC * _tmp31_);
 #line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						r = ((0xED / 255.0) * (1 - _tmp30_)) + (0xCC * _tmp31_);
+#line 1329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp32_ = p;
-#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						g = (0xD4 / 255.0) * (1 - _tmp32_);
 #line 1329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						b = (gdouble) 0;
+						g = (0xD4 / 255.0) * (1 - _tmp32_);
 #line 1330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						b = (gdouble) 0;
+#line 1331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 6208 "ui.c"
+#line 6207 "ui.c"
 					}
 					default:
-#line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 6213 "ui.c"
+#line 6212 "ui.c"
 				}
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp33_ = r;
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp34_ = r;
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				r = _tmp33_ + ((1.0 - _tmp34_) * 0.7);
 #line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				r = _tmp33_ + ((1.0 - _tmp34_) * 0.7);
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp35_ = g;
-#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp36_ = g;
-#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				g = _tmp35_ + ((1.0 - _tmp36_) * 0.7);
 #line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				g = _tmp35_ + ((1.0 - _tmp36_) * 0.7);
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp37_ = b;
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp38_ = b;
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				b = _tmp37_ + ((1.0 - _tmp38_) * 0.7);
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp39_ = items;
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp40_ = i;
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp41_ = string_get (_tmp39_, (glong) _tmp40_);
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp42_ = g_strdup_printf ("%c", (gint) _tmp41_);
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp43_ = _tmp42_;
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp44_ = r;
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp45_ = g;
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp46_ = b;
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp47_ = page_icon_new (_tmp43_, _tmp44_, _tmp45_, _tmp46_);
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				g_object_ref_sink (_tmp47_);
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp48_ = _tmp47_;
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (_tmp43_);
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				icon = _tmp48_;
 #line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				icon = _tmp48_;
+#line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp49_ = icon;
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				gtk_widget_set_visible ((GtkWidget*) _tmp49_, TRUE);
 #line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				gtk_widget_set_visible ((GtkWidget*) _tmp49_, TRUE);
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp50_ = page_box;
-#line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp51_ = icon;
-#line 1340 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_box_pack_start (_tmp50_, (GtkWidget*) _tmp51_, FALSE, FALSE, (guint) 0);
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (icon);
-#line 6271 "ui.c"
+#line 6270 "ui.c"
 			}
 		}
 	}
-#line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = box;
-#line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (page_box);
-#line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 6281 "ui.c"
+#line 6280 "ui.c"
 }
 
 
 static void user_interface_save_file_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, FALSE);
-#line 6292 "ui.c"
+#line 6291 "ui.c"
 }
 
 
 static void _user_interface_save_file_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_file_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6299 "ui.c"
+#line 6298 "ui.c"
 }
 
 
 void user_interface_save_document_activate_cb (UserInterface* self) {
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, FALSE);
-#line 6308 "ui.c"
+#line 6307 "ui.c"
 }
 
 
@@ -6315,76 +6314,76 @@ static void user_interface_copy_to_clipboard_button_clicked_cb (UserInterface* s
 	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	page = _tmp3_;
 #line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page = _tmp3_;
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ != NULL) {
-#line 6337 "ui.c"
+#line 6336 "ui.c"
 		Page* _tmp5_ = NULL;
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = page;
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_copy_to_clipboard (_tmp5_, (GtkWindow*) self);
-#line 6343 "ui.c"
+#line 6342 "ui.c"
 	}
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 6347 "ui.c"
+#line 6346 "ui.c"
 }
 
 
 static void _user_interface_copy_to_clipboard_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_copy_to_clipboard_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6354 "ui.c"
+#line 6353 "ui.c"
 }
 
 
 static void user_interface_save_as_file_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1368 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, TRUE);
-#line 6365 "ui.c"
+#line 6364 "ui.c"
 }
 
 
 static void _user_interface_save_as_file_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_as_file_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6372 "ui.c"
+#line 6371 "ui.c"
 }
 
 
 void user_interface_save_as_document_activate_cb (UserInterface* self) {
-#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, TRUE);
-#line 6381 "ui.c"
+#line 6380 "ui.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 6388 "ui.c"
+#line 6387 "ui.c"
 }
 
 
@@ -6422,118 +6421,118 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op
 	GdkPixbuf* _tmp30_ = NULL;
 	cairo_t* _tmp31_ = NULL;
 	cairo_t* _tmp32_ = NULL;
-#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (operation != NULL);
-#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (print_context != NULL);
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = print_context;
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_print_context_get_cairo_context (_tmp0_);
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _cairo_reference0 (_tmp1_);
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	context = _tmp2_;
 #line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	context = _tmp2_;
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->_book;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_number;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_get_page (_tmp3_, _tmp4_);
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp5_;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	is_landscape = FALSE;
 #line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	is_landscape = FALSE;
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = print_context;
-#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = gtk_print_context_get_width (_tmp6_);
-#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = print_context;
-#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = gtk_print_context_get_height (_tmp8_);
-#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp7_ > _tmp9_) {
 #line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp7_ > _tmp9_) {
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		is_landscape = TRUE;
-#line 6462 "ui.c"
+#line 6461 "ui.c"
 	}
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = page;
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = page_get_is_landscape (_tmp10_);
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = _tmp11_;
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = is_landscape;
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp12_ != _tmp13_) {
-#line 6474 "ui.c"
+#line 6473 "ui.c"
 		cairo_t* _tmp14_ = NULL;
 		GtkPrintContext* _tmp15_ = NULL;
 		gdouble _tmp16_ = 0.0;
 		cairo_t* _tmp17_ = NULL;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = context;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = print_context;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = gtk_print_context_get_width (_tmp15_);
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		cairo_translate (_tmp14_, _tmp16_, (gdouble) 0);
 #line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		cairo_translate (_tmp14_, _tmp16_, (gdouble) 0);
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = context;
-#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		cairo_rotate (_tmp17_, G_PI_2);
-#line 6491 "ui.c"
+#line 6490 "ui.c"
 	}
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = context;
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = print_context;
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = gtk_print_context_get_dpi_x (_tmp19_);
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = page;
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = page_get_dpi (_tmp21_);
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = _tmp22_;
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = print_context;
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = gtk_print_context_get_dpi_y (_tmp24_);
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = page;
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = page_get_dpi (_tmp26_);
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = _tmp27_;
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_scale (_tmp18_, _tmp20_ / _tmp23_, _tmp25_ / _tmp28_);
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = page;
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = page_get_image (_tmp29_, TRUE);
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	image = _tmp30_;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	image = _tmp30_;
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = context;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gdk_cairo_set_source_pixbuf (_tmp31_, image, (gdouble) 0, (gdouble) 0);
 #line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gdk_cairo_set_source_pixbuf (_tmp31_, image, (gdouble) 0, (gdouble) 0);
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = context;
-#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_paint (_tmp32_);
-#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (image);
-#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 1376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_cairo_destroy0 (context);
-#line 6537 "ui.c"
+#line 6536 "ui.c"
 }
 
 
@@ -6541,26 +6540,26 @@ static void user_interface_email_button_clicked_cb (UserInterface* self, GtkWidg
 	const gchar* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->document_hint;
-#line 1404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
-#line 6557 "ui.c"
+#line 6556 "ui.c"
 }
 
 
 static void _user_interface_email_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_email_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6564 "ui.c"
+#line 6563 "ui.c"
 }
 
 
@@ -6568,24 +6567,24 @@ void user_interface_email_document_activate_cb (UserInterface* self) {
 	const gchar* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->document_hint;
-#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
-#line 6582 "ui.c"
+#line 6581 "ui.c"
 }
 
 
 static void _user_interface_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self) {
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_draw_page ((UserInterface*) self, _sender, context, page_nr);
-#line 6589 "ui.c"
+#line 6588 "ui.c"
 }
 
 
@@ -6597,29 +6596,29 @@ static void user_interface_print_document (UserInterface* self) {
 	guint _tmp3_ = 0U;
 	guint _tmp6_ = 0U;
 	GError * _inner_error_ = NULL;
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_print_operation_new ();
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	print = _tmp0_;
 #line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	print = _tmp0_;
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_set (print, "n-pages", (gint) _tmp3_, NULL);
 #line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_set (print, "n-pages", (gint) _tmp3_, NULL);
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (print, "draw-page", (GCallback) _user_interface_draw_page_gtk_print_operation_draw_page, self, 0);
-#line 6617 "ui.c"
+#line 6616 "ui.c"
 	{
-#line 1420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, (GtkWindow*) self, &_inner_error_);
-#line 1420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6623 "ui.c"
+#line 6622 "ui.c"
 			goto __catch20_g_error;
 		}
 	}
@@ -6629,90 +6628,90 @@ static void user_interface_print_document (UserInterface* self) {
 		GError* e = NULL;
 		GError* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = e;
-#line 1424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp4_->message;
-#line 1424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1424: Error printing: %s", _tmp5_);
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:1425: Error printing: %s", _tmp5_);
+#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 6645 "ui.c"
+#line 6644 "ui.c"
 	}
 	__finally20:
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (print);
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 6658 "ui.c"
+#line 6657 "ui.c"
 	}
-#line 1427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("draw-page", gtk_print_operation_get_type (), &_tmp6_, NULL, FALSE);
-#line 1427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (print, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _user_interface_draw_page_gtk_print_operation_draw_page, self);
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (print);
-#line 6666 "ui.c"
+#line 6665 "ui.c"
 }
 
 
 static void user_interface_print_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 1431 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1431 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document (self);
-#line 6677 "ui.c"
+#line 6676 "ui.c"
 }
 
 
 static void _user_interface_print_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_button_clicked_cb ((UserInterface*) self, _sender);
-#line 6684 "ui.c"
+#line 6683 "ui.c"
 }
 
 
 void user_interface_print_document_activate_cb (UserInterface* self) {
-#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document (self);
-#line 6693 "ui.c"
+#line 6692 "ui.c"
 }
 
 
 static void user_interface_launch_help (UserInterface* self) {
 	GError * _inner_error_ = NULL;
-#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 6701 "ui.c"
+#line 6700 "ui.c"
 	{
 		GdkScreen* _tmp0_ = NULL;
 		GdkScreen* _tmp1_ = NULL;
 		guint32 _tmp2_ = 0U;
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = gtk_window_get_screen ((GtkWindow*) self);
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = _tmp0_;
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_get_current_event_time ();
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_show_uri (_tmp1_, "help:simple-scan", _tmp2_, &_inner_error_);
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6716 "ui.c"
+#line 6715 "ui.c"
 			goto __catch21_g_error;
 		}
 	}
@@ -6723,60 +6722,60 @@ static void user_interface_launch_help (UserInterface* self) {
 		const gchar* _tmp3_ = NULL;
 		GError* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _ ("Unable to open help file");
-#line 1449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = e;
-#line 1449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp4_->message;
-#line 1449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp3_, _tmp5_);
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 6741 "ui.c"
+#line 6740 "ui.c"
 	}
 	__finally21:
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 6752 "ui.c"
+#line 6751 "ui.c"
 	}
 }
 
 
 static void user_interface_help_contents_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1458 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_launch_help (self);
-#line 6764 "ui.c"
+#line 6763 "ui.c"
 }
 
 
 static void _user_interface_help_contents_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_help_contents_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 6771 "ui.c"
+#line 6770 "ui.c"
 }
 
 
 void user_interface_help_contents_activate_cb (UserInterface* self) {
-#line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_launch_help (self);
-#line 6780 "ui.c"
+#line 6779 "ui.c"
 }
 
 
@@ -6796,21 +6795,21 @@ static void user_interface_show_about (UserInterface* self) {
 	const gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
 	const gchar* _tmp8_ = NULL;
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("Robert Ancell <robert.ancell@canonical.com>");
-#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_new0 (gchar*, 1 + 1);
-#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_[0] = _tmp0_;
-#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors = _tmp1_;
-#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors_length1 = 1;
-#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_authors_size_ = authors_length1;
-#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _ ("This program is free software: you can redistribute it and/or modify\n" \
 "it under the terms of the GNU General Public License as published by\n" \
 "the Free Software Foundation, either version 3 of the License, or\n" \
@@ -6823,62 +6822,62 @@ static void user_interface_show_about (UserInterface* self) {
 "\n" \
 "You should have received a copy of the GNU General Public License\n" \
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.");
-#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	license = _tmp3_;
-#line 1474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _ ("About Simple Scan");
-#line 1474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 1474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	title = _tmp5_;
-#line 1477 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _ ("Simple document scanning tool");
-#line 1477 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 1477 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	description = _tmp7_;
-#line 1479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("translator-credits");
-#line 1479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_show_about_dialog ((GtkWindow*) self, "title", title, "program-name", "Simple Scan", "version", VERSION, "comments", description, "logo-icon-name", "scanner", "authors", authors, "translator-credits", _tmp8_, "website", "https://launchpad.net/simple-scan", "copyright", "Copyright © 2009-2015 Canonical Ltd.", "license", license, "wrap-license", TRUE, NULL, NULL);
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (description);
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (title);
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (license);
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors = (_vala_array_free (authors, authors_length1, (GDestroyNotify) g_free), NULL);
-#line 6844 "ui.c"
+#line 6843 "ui.c"
 }
 
 
 static void user_interface_about_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_about (self);
-#line 6855 "ui.c"
+#line 6854 "ui.c"
 }
 
 
 static void _user_interface_about_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_about_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 6862 "ui.c"
+#line 6861 "ui.c"
 }
 
 
 void user_interface_about_activate_cb (UserInterface* self) {
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_about (self);
-#line 6871 "ui.c"
+#line 6870 "ui.c"
 }
 
 
@@ -6889,213 +6888,209 @@ static gboolean user_interface_on_quit (UserInterface* self) {
 	gboolean _tmp2_ = FALSE;
 	guint _tmp3_ = 0U;
 	AutosaveManager* _tmp4_ = NULL;
-#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1508 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Save document before quitting?");
-#line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1508 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Quit without Saving");
-#line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1508 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_prompt_to_save (self, _tmp0_, _tmp1_);
-#line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1508 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 1511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 1511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 6896 "ui.c"
+#line 6895 "ui.c"
 	}
-#line 1513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) self);
-#line 1515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->save_state_timeout;
-#line 1515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp3_ != ((guint) 0)) {
 #line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp3_ != ((guint) 0)) {
+#line 1517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, TRUE);
-#line 6906 "ui.c"
+#line 6905 "ui.c"
 	}
-#line 1518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->autosave_manager;
-#line 1518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	autosave_manager_cleanup (_tmp4_);
-#line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1521 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1521 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 6916 "ui.c"
+#line 6915 "ui.c"
 }
 
 
 static void user_interface_quit_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_quit (self);
-#line 6927 "ui.c"
+#line 6926 "ui.c"
 }
 
 
 static void _user_interface_quit_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_quit_menuitem_activate_cb ((UserInterface*) self, _sender);
-#line 6934 "ui.c"
+#line 6933 "ui.c"
 }
 
 
 void user_interface_quit_activate_cb (UserInterface* self) {
-#line 1529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1530 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_quit (self);
-#line 6943 "ui.c"
+#line 6942 "ui.c"
 }
 
 
-static gboolean user_interface_simple_scan_window_configure_event_cb (UserInterface* self, GtkWidget* widget, GdkEventConfigure* event) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
+static void user_interface_real_size_allocate (GtkWidget* base, GtkAllocation* allocation) {
+	UserInterface * self;
+	GtkAllocation _tmp0_ = {0};
+	gboolean _tmp1_ = FALSE;
+	gboolean _tmp2_ = FALSE;
 #line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (widget != NULL, FALSE);
+	self = (UserInterface*) base;
 #line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
+	g_return_if_fail (allocation != NULL);
 #line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->window_is_maximized;
+	_tmp0_ = *allocation;
 #line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp0_) {
-#line 6960 "ui.c"
-		GdkEventConfigure* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
-		GdkEventConfigure* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
+	GTK_WIDGET_CLASS (user_interface_parent_class)->size_allocate ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), &_tmp0_);
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = self->priv->window_is_maximized;
 #line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp1_ = event;
+	if (!_tmp2_) {
+#line 6963 "ui.c"
+		gboolean _tmp3_ = FALSE;
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = self->priv->window_is_fullscreen;
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp1_ = !_tmp3_;
+#line 6969 "ui.c"
+	} else {
 #line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = _tmp1_->width;
+		_tmp1_ = FALSE;
+#line 6973 "ui.c"
+	}
 #line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->window_width = _tmp2_;
-#line 1540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = event;
-#line 1540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = _tmp3_->height;
-#line 1540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->window_height = _tmp4_;
+	if (_tmp1_) {
+#line 6977 "ui.c"
+		gint _tmp4_ = 0;
+		gint _tmp5_ = 0;
 #line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_window_get_size ((GtkWindow*) self, &_tmp4_, &_tmp5_);
+#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		self->priv->window_width = _tmp4_;
+#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		self->priv->window_height = _tmp5_;
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, FALSE);
-#line 6979 "ui.c"
+#line 6988 "ui.c"
 	}
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = FALSE;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 6985 "ui.c"
-}
-
-
-static gboolean _user_interface_simple_scan_window_configure_event_cb_gtk_widget_configure_event (GtkWidget* _sender, GdkEventConfigure* event, gpointer self) {
-	gboolean result;
-	result = user_interface_simple_scan_window_configure_event_cb ((UserInterface*) self, _sender, event);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 6994 "ui.c"
 }
 
 
 static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar* widget, gint response_id) {
 	gint _tmp0_ = 0;
-#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = response_id;
-#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (_tmp0_) {
-#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case 1:
-#line 7010 "ui.c"
+#line 7005 "ui.c"
 		{
 			GtkComboBox* _tmp1_ = NULL;
 			GtkDialog* _tmp2_ = NULL;
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp1_ = self->priv->device_combo;
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_widget_grab_focus ((GtkWidget*) _tmp1_);
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp2_ = self->priv->preferences_dialog;
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_window_present ((GtkWindow*) _tmp2_);
-#line 1555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 7024 "ui.c"
+#line 7019 "ui.c"
 		}
-#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case 2:
-#line 7028 "ui.c"
+#line 7023 "ui.c"
 		{
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			user_interface_install_drivers (self);
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 7034 "ui.c"
+#line 7029 "ui.c"
 		}
 		default:
 		{
-#line 1561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			self->priv->have_error = FALSE;
-#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (self->priv->error_title);
-#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			self->priv->error_title = NULL;
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (self->priv->error_text);
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			self->priv->error_text = NULL;
-#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			user_interface_update_info_bar (self);
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 7052 "ui.c"
+#line 7047 "ui.c"
 		}
 	}
 }
 
 
 static Block3Data* block3_data_ref (Block3Data* _data3_) {
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_atomic_int_inc (&_data3_->_ref_count_);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return _data3_;
-#line 7063 "ui.c"
+#line 7058 "ui.c"
 }
 
 
 static void block3_data_unref (void * _userdata_) {
 	Block3Data* _data3_;
 	_data3_ = (Block3Data*) _userdata_;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) {
-#line 7072 "ui.c"
+#line 7067 "ui.c"
 		UserInterface* self;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self = _data3_->self;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data3_->instructions_label);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data3_->status_label);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data3_->spinner);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data3_->stack);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (self);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_slice_free (Block3Data, _data3_);
-#line 7088 "ui.c"
+#line 7083 "ui.c"
 	}
 }
 
@@ -7105,9 +7100,9 @@ static void ___lambda12_ (UserInterface* self) {
 
 
 static void ____lambda12__pk_progress_callback (PkProgress* progress, PkProgressType type, gpointer self) {
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	___lambda12_ ((UserInterface*) self);
-#line 7100 "ui.c"
+#line 7095 "ui.c"
 }
 
 
@@ -7124,35 +7119,35 @@ static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _r
 	GtkLabel* _tmp23_ = NULL;
 	const gchar* _tmp24_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data3_->self;
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (_result_ != NULL);
-#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _data3_->status_label;
-#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, TRUE);
-#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _data3_->spinner;
-#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_set (_tmp1_, "active", FALSE, NULL);
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _data3_->status_label;
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_text (_tmp2_, "☒");
-#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _data3_->stack;
-#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _data3_->status_label;
-#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_stack_set_visible_child (_tmp3_, (GtkWidget*) _tmp4_);
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _ ("Drivers installed successfully!");
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = g_strdup (_tmp5_);
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result_text = _tmp6_;
-#line 7145 "ui.c"
+#line 7140 "ui.c"
 	{
 		PkResults* results = NULL;
 		GAsyncResult* _tmp7_ = NULL;
@@ -7160,34 +7155,34 @@ static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _r
 		PkError* _tmp9_ = NULL;
 		PkError* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _result_;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = user_interface_install_packages_finish (self, _tmp7_, &_inner_error_);
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		results = _tmp8_;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7161 "ui.c"
+#line 7156 "ui.c"
 			goto __catch22_g_error;
 		}
-#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = pk_results_get_error_code (results);
-#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = _tmp9_;
-#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = _tmp10_ == NULL;
-#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_tmp10_);
-#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp11_) {
-#line 7174 "ui.c"
+#line 7169 "ui.c"
 			GtkLabel* _tmp12_ = NULL;
-#line 1659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp12_ = _data3_->status_label;
-#line 1659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_label_set_text (_tmp12_, "☑");
-#line 7180 "ui.c"
+#line 7175 "ui.c"
 		} else {
 			PkError* e = NULL;
 			PkError* _tmp13_ = NULL;
@@ -7196,31 +7191,31 @@ static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _r
 			PkErrorEnum _tmp16_ = 0;
 			PkErrorEnum _tmp17_ = 0;
 			gchar* _tmp18_ = NULL;
-#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp13_ = pk_results_get_error_code (results);
-#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			e = _tmp13_;
-#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp14_ = _ ("Failed to install drivers (error code %d).");
-#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp15_ = e;
-#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_object_get (_tmp15_, "code", &_tmp16_, NULL);
-#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp17_ = _tmp16_;
-#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp18_ = g_strdup_printf (_tmp14_, _tmp17_);
-#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (result_text);
-#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			result_text = _tmp18_;
-#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (e);
-#line 7209 "ui.c"
+#line 7204 "ui.c"
 		}
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (results);
-#line 7213 "ui.c"
+#line 7208 "ui.c"
 	}
 	goto __finally22;
 	__catch22_g_error:
@@ -7230,59 +7225,59 @@ static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _r
 		gchar* _tmp20_ = NULL;
 		GError* _tmp21_ = NULL;
 		const gchar* _tmp22_ = NULL;
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = _ ("Failed to install drivers.");
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp20_ = g_strdup (_tmp19_);
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (result_text);
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result_text = _tmp20_;
-#line 1671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp21_ = e;
-#line 1671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp22_ = _tmp21_->message;
-#line 1671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1671: Failed to install drivers: %s", _tmp22_);
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:1670: Failed to install drivers: %s", _tmp22_);
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 7243 "ui.c"
+#line 7238 "ui.c"
 	}
 	__finally22:
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (result_text);
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 7256 "ui.c"
+#line 7251 "ui.c"
 	}
-#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = _data3_->instructions_label;
-#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = result_text;
-#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_text (_tmp23_, _tmp24_);
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (result_text);
-#line 7266 "ui.c"
+#line 7261 "ui.c"
 }
 
 
 static void ____lambda13__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) {
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	___lambda13_ (self, source_object, res);
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	block3_data_unref (self);
-#line 7275 "ui.c"
+#line 7270 "ui.c"
 }
 
 
@@ -7299,21 +7294,21 @@ static void user_interface_install_drivers (UserInterface* self) {
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	GQuark _tmp6_ = 0U;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp5_label0 = 0;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp5_label1 = 0;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp5_label2 = 0;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp5_label3 = 0;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp5_label4 = 0;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp5_label5 = 0;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp5_label6 = 0;
-#line 7306 "ui.c"
+#line 7301 "ui.c"
 	GtkDialog* dialog = NULL;
 	const gchar* _tmp23_ = NULL;
 	const gchar* _tmp24_ = NULL;
@@ -7367,397 +7362,397 @@ static void user_interface_install_drivers (UserInterface* self) {
 	gint _tmp69__length1 = 0;
 	GtkDialog* _tmp75_ = NULL;
 	GtkDialog* _tmp76_ = NULL;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data3_ = g_slice_new0 (Block3Data);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data3_->_ref_count_ = 1;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data3_->self = g_object_ref (self);
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("");
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	message = _tmp0_;
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup ("");
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	instructions = _tmp1_;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_new0 (gchar*, 0 + 1);
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	packages_to_install = _tmp2_;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	packages_to_install_length1 = 0;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_packages_to_install_size_ = packages_to_install_length1;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->missing_driver;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _tmp3_;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = (NULL == _tmp4_) ? 0 : g_quark_from_string (_tmp4_);
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((((_tmp6_ == ((0 != _tmp5_label0) ? _tmp5_label0 : (_tmp5_label0 = g_quark_from_static_string ("brscan")))) || (_tmp6_ == ((0 != _tmp5_label1) ? _tmp5_label1 : (_tmp5_label1 = g_quark_from_static_string ("brscan2"))))) || (_tmp6_ == ((0 != _tmp5_label2) ? _tmp5_label2 : (_tmp5_label2 = g_quark_from_static_string ("brscan3"))))) || (_tmp6_ == ((0 != _tmp5_label3) ? _tmp5_label3 : (_tmp5_label3 = g_quark_from_static_string ("brscan4"))))) {
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 7394 "ui.c"
+#line 7389 "ui.c"
 			default:
 			{
 				const gchar* _tmp7_ = NULL;
 				gchar* _tmp8_ = NULL;
 				const gchar* _tmp9_ = NULL;
 				gchar* _tmp10_ = NULL;
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = _ ("You appear to have a Brother scanner.");
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = g_strdup (_tmp7_);
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (message);
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				message = _tmp8_;
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = _ ("Drivers for this are available on the <a href=\"http://support.brother" \
 ".com\">Brother website</a>.");
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp10_ = g_strdup (_tmp9_);
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (instructions);
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				instructions = _tmp10_;
-#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 7419 "ui.c"
+#line 7414 "ui.c"
 			}
 		}
 	} else if (_tmp6_ == ((0 != _tmp5_label4) ? _tmp5_label4 : (_tmp5_label4 = g_quark_from_static_string ("samsung")))) {
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 7425 "ui.c"
+#line 7420 "ui.c"
 			default:
 			{
 				const gchar* _tmp11_ = NULL;
 				gchar* _tmp12_ = NULL;
 				const gchar* _tmp13_ = NULL;
 				gchar* _tmp14_ = NULL;
-#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp11_ = _ ("You appear to have a Samsung scanner.");
-#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = g_strdup (_tmp11_);
-#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (message);
-#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				message = _tmp12_;
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp13_ = _ ("Drivers for this are available on the <a href=\"http://samsung.com/sup" \
 "port\">Samsung website</a>.");
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp14_ = g_strdup (_tmp13_);
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (instructions);
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				instructions = _tmp14_;
-#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 7450 "ui.c"
+#line 7445 "ui.c"
 			}
 		}
 	} else if (_tmp6_ == ((0 != _tmp5_label5) ? _tmp5_label5 : (_tmp5_label5 = g_quark_from_static_string ("hpaio")))) {
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 7456 "ui.c"
+#line 7451 "ui.c"
 			default:
 			{
 				const gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
 				gchar* _tmp17_ = NULL;
 				gchar** _tmp18_ = NULL;
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp15_ = _ ("You appear to have an HP scanner.");
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp16_ = g_strdup (_tmp15_);
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (message);
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				message = _tmp16_;
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp17_ = g_strdup ("libsane-hpaio");
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp18_ = g_new0 (gchar*, 1 + 1);
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp18_[0] = _tmp17_;
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				packages_to_install = (_vala_array_free (packages_to_install, packages_to_install_length1, (GDestroyNotify) g_free), NULL);
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				packages_to_install = _tmp18_;
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				packages_to_install_length1 = 1;
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_packages_to_install_size_ = packages_to_install_length1;
-#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 7487 "ui.c"
+#line 7482 "ui.c"
 			}
 		}
 	} else if (_tmp6_ == ((0 != _tmp5_label6) ? _tmp5_label6 : (_tmp5_label6 = g_quark_from_static_string ("epkowa")))) {
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 7493 "ui.c"
+#line 7488 "ui.c"
 			default:
 			{
 				const gchar* _tmp19_ = NULL;
 				gchar* _tmp20_ = NULL;
 				const gchar* _tmp21_ = NULL;
 				gchar* _tmp22_ = NULL;
-#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp19_ = _ ("You appear to have an Epson scanner.");
-#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp20_ = g_strdup (_tmp19_);
-#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (message);
-#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				message = _tmp20_;
-#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = _ ("Drivers for this are available on the <a href=\"http://support.epson.c" \
 "om\">Epson website</a>.");
-#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp22_ = g_strdup (_tmp21_);
-#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (instructions);
-#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				instructions = _tmp22_;
-#line 1600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 7518 "ui.c"
+#line 7513 "ui.c"
 			}
 		}
 	}
-#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = _ ("Install drivers");
-#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = _ ("_Close");
-#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = (GtkDialog*) gtk_dialog_new_with_buttons (_tmp23_, (GtkWindow*) self, GTK_DIALOG_MODAL, _tmp24_, GTK_RESPONSE_CLOSE, NULL);
-#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp25_);
-#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dialog = _tmp25_;
-#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = dialog;
-#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = (GtkBox*) gtk_dialog_get_content_area (_tmp26_);
-#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_set_border_width ((GtkContainer*) _tmp27_, (guint) 12);
-#line 1605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = dialog;
-#line 1605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = (GtkBox*) gtk_dialog_get_content_area (_tmp28_);
-#line 1605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_set_spacing (_tmp29_, 6);
-#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = message;
-#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = (GtkLabel*) gtk_label_new (_tmp30_);
-#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp31_);
-#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	label = _tmp31_;
-#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = label;
-#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp32_, TRUE);
-#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = label;
-#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_xalign (_tmp33_, 0.f);
-#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp34_ = dialog;
-#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = (GtkBox*) gtk_dialog_get_content_area (_tmp34_);
-#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp36_ = label;
-#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp35_, (GtkWidget*) _tmp36_, TRUE, TRUE, (guint) 0);
-#line 1612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp37_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#line 1612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp37_);
-#line 1612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	instructions_box = _tmp37_;
-#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp38_ = instructions_box;
-#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp38_, TRUE);
-#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp39_ = dialog;
-#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp40_ = (GtkBox*) gtk_dialog_get_content_area (_tmp39_);
-#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp41_ = instructions_box;
-#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp40_, (GtkWidget*) _tmp41_, TRUE, TRUE, (guint) 0);
-#line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp42_ = (GtkStack*) gtk_stack_new ();
-#line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp42_);
-#line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data3_->stack = _tmp42_;
-#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp43_ = instructions_box;
-#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp44_ = _data3_->stack;
-#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp43_, (GtkWidget*) _tmp44_, FALSE, FALSE, (guint) 0);
-#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp45_ = (GtkSpinner*) gtk_spinner_new ();
-#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp45_);
-#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data3_->spinner = _tmp45_;
-#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp46_ = _data3_->spinner;
-#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp46_, TRUE);
-#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp47_ = _data3_->stack;
-#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp48_ = _data3_->spinner;
-#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) _tmp47_, (GtkWidget*) _tmp48_);
-#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp49_ = (GtkLabel*) gtk_label_new ("");
-#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp49_);
-#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data3_->status_label = _tmp49_;
-#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp50_ = _data3_->status_label;
-#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp50_, TRUE);
-#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp51_ = _data3_->stack;
-#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp52_ = _data3_->status_label;
-#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) _tmp51_, (GtkWidget*) _tmp52_);
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp53_ = instructions;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp54_ = (GtkLabel*) gtk_label_new (_tmp53_);
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp54_);
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data3_->instructions_label = _tmp54_;
-#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp55_ = _data3_->instructions_label;
-#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp55_, TRUE);
-#line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp56_ = _data3_->instructions_label;
-#line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_xalign (_tmp56_, 0.f);
-#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp57_ = _data3_->instructions_label;
-#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_use_markup (_tmp57_, TRUE);
-#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp58_ = instructions_box;
-#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp59_ = _data3_->instructions_label;
-#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp58_, (GtkWidget*) _tmp59_, FALSE, FALSE, (guint) 0);
-#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp60_ = _ ("Once installed you will need to restart Simple Scan.");
-#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp61_ = (GtkLabel*) gtk_label_new (_tmp60_);
-#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp61_);
-#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (label);
-#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	label = _tmp61_;
-#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp62_ = label;
-#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp62_, TRUE);
-#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp63_ = label;
-#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_xalign (_tmp63_, 0.f);
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp64_ = dialog;
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp65_ = (GtkBox*) gtk_dialog_get_content_area (_tmp64_);
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_set_border_width ((GtkContainer*) _tmp65_, (guint) 12);
-#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp66_ = dialog;
-#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp67_ = (GtkBox*) gtk_dialog_get_content_area (_tmp66_);
-#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp68_ = label;
-#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp67_, (GtkWidget*) _tmp68_, TRUE, TRUE, (guint) 0);
-#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp69_ = packages_to_install;
-#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp69__length1 = packages_to_install_length1;
-#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp69__length1 > 0) {
-#line 7694 "ui.c"
+#line 7689 "ui.c"
 		GtkStack* _tmp70_ = NULL;
 		GtkSpinner* _tmp71_ = NULL;
 		GtkLabel* _tmp72_ = NULL;
 		const gchar* _tmp73_ = NULL;
 		gchar** _tmp74_ = NULL;
 		gint _tmp74__length1 = 0;
-#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp70_ = _data3_->stack;
-#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_visible ((GtkWidget*) _tmp70_, TRUE);
-#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp71_ = _data3_->spinner;
-#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_object_set (_tmp71_, "active", TRUE, NULL);
-#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp72_ = _data3_->instructions_label;
-#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp73_ = _ ("Installing drivers...");
-#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_label_set_text (_tmp72_, _tmp73_);
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp74_ = packages_to_install;
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp74__length1 = packages_to_install_length1;
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_install_packages (self, _tmp74_, _tmp74__length1, ____lambda12__pk_progress_callback, self, ____lambda13__gasync_ready_callback, block3_data_ref (_data3_));
-#line 7721 "ui.c"
+#line 7716 "ui.c"
 	}
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp75_ = dialog;
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_run (_tmp75_);
-#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp76_ = dialog;
-#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _tmp76_);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (instructions_box);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (label);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	packages_to_install = (_vala_array_free (packages_to_install, packages_to_install_length1, (GDestroyNotify) g_free), NULL);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (instructions);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (message);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	block3_data_unref (_data3_);
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data3_ = NULL;
-#line 7747 "ui.c"
+#line 7742 "ui.c"
 }
 
 
@@ -7770,7 +7765,7 @@ static void user_interface_install_packages_data_free (gpointer _data) {
 	_g_object_unref0 (_data_->self);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_slice_free (UserInterfaceInstallPackagesData, _data_);
-#line 7760 "ui.c"
+#line 7755 "ui.c"
 }
 
 
@@ -7809,7 +7804,7 @@ static void user_interface_install_packages (UserInterface* self, gchar** packag
 	_data_->progress_callback_target = _tmp2__target;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_install_packages_co (_data_);
-#line 7799 "ui.c"
+#line 7794 "ui.c"
 }
 
 
@@ -7820,7 +7815,7 @@ static PkResults* user_interface_install_packages_finish (UserInterface* self, G
 	if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return NULL;
-#line 7810 "ui.c"
+#line 7805 "ui.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
@@ -7830,552 +7825,579 @@ static PkResults* user_interface_install_packages_finish (UserInterface* self, G
 	_data_->result = NULL;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 7820 "ui.c"
+#line 7815 "ui.c"
 }
 
 
 static void user_interface_install_packages_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) {
 	UserInterfaceInstallPackagesData* _data_;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_ = _user_data_;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_source_object_ = source_object;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_res_ = _res_;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_install_packages_co (_data_);
-#line 7834 "ui.c"
+#line 7829 "ui.c"
 }
 
 
 static gint g_ptr_array_get_length (GPtrArray* self) {
 	gint result;
 	guint _tmp0_ = 0U;
-#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	_tmp0_ = self->len;
-#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	result = (gint) _tmp0_;
-#line 4442 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	return result;
-#line 7849 "ui.c"
+#line 7844 "ui.c"
 }
 
 
 static void g_ptr_array_set_length (GPtrArray* self, gint value) {
 	gint _tmp0_ = 0;
-#line 4443 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4453 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	g_return_if_fail (self != NULL);
-#line 4443 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4453 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	_tmp0_ = value;
-#line 4443 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 4453 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
 	g_ptr_array_set_size (self, _tmp0_);
-#line 7861 "ui.c"
+#line 7856 "ui.c"
 }
 
 
 static gboolean user_interface_install_packages_co (UserInterfaceInstallPackagesData* _data_) {
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (_data_->_state_) {
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case 0:
-#line 7870 "ui.c"
+#line 7865 "ui.c"
 		goto _state_0;
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case 1:
-#line 7874 "ui.c"
+#line 7869 "ui.c"
 		goto _state_1;
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case 2:
-#line 7878 "ui.c"
+#line 7873 "ui.c"
 		goto _state_2;
 		default:
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_assert_not_reached ();
-#line 7883 "ui.c"
+#line 7878 "ui.c"
 	}
 	_state_0:
-#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp0_ = NULL;
-#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp0_ = pk_task_new ();
-#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->task = _data_->_tmp0_;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp2_ = NULL;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp2_ = _data_->task;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp3_ = NULL;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp3__length1 = 0;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp3_ = _data_->packages;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp3__length1 = _data_->packages_length1;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp4_ = NULL;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp4__target = NULL;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp4_ = _data_->progress_callback;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp4__target = _data_->progress_callback_target;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_state_ = 1;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	pk_task_resolve_async (_data_->_tmp2_, (PkBitfield) PK_FILTER_ENUM_NOT_INSTALLED, _data_->_tmp3_, NULL, _data_->_tmp4_, _data_->_tmp4__target, user_interface_install_packages_ready, _data_);
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return FALSE;
-#line 7918 "ui.c"
+#line 7913 "ui.c"
 	_state_1:
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp5_ = NULL;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp5_ = pk_task_generic_finish (_data_->_tmp2_, _data_->_res_, &_data_->_inner_error_);
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp1_ = _data_->_tmp5_;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_error_free (_data_->_inner_error_);
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data_->results);
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data_->task);
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_data_->_state_ == 0) {
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 7940 "ui.c"
+#line 7935 "ui.c"
 		} else {
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_simple_async_result_complete (_data_->_async_result);
-#line 7944 "ui.c"
+#line 7939 "ui.c"
 		}
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_object_unref (_data_->_async_result);
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return FALSE;
-#line 7950 "ui.c"
+#line 7945 "ui.c"
 	}
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp6_ = NULL;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp6_ = _data_->_tmp1_;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp1_ = NULL;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_data_->results);
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->results = _data_->_tmp6_;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp8_ = NULL;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp8_ = _data_->results;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_data_->_tmp8_ == NULL) {
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->_tmp7_ = TRUE;
-#line 7970 "ui.c"
+#line 7965 "ui.c"
 	} else {
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->_tmp9_ = NULL;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->_tmp9_ = _data_->results;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->_tmp10_ = NULL;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->_tmp10_ = pk_results_get_error_code (_data_->_tmp9_);
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->_tmp11_ = NULL;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->_tmp11_ = _data_->_tmp10_;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->_tmp7_ = _data_->_tmp11_ != NULL;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data_->_tmp11_);
-#line 7988 "ui.c"
+#line 7983 "ui.c"
 	}
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_data_->_tmp7_) {
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->result = _data_->results;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data_->_tmp1_);
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data_->task);
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_data_->_state_ == 0) {
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 8002 "ui.c"
+#line 7997 "ui.c"
 		} else {
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_simple_async_result_complete (_data_->_async_result);
-#line 8006 "ui.c"
+#line 8001 "ui.c"
 		}
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_object_unref (_data_->_async_result);
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return FALSE;
-#line 8012 "ui.c"
+#line 8007 "ui.c"
 	}
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp12_ = NULL;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp12_ = _data_->results;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp13_ = NULL;
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp13_ = pk_results_get_package_array (_data_->_tmp12_);
-#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->package_array = _data_->_tmp13_;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp14_ = NULL;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp14_ = _data_->package_array;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp15_ = 0;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp15_ = g_ptr_array_get_length (_data_->_tmp14_);
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp16_ = 0;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp16_ = _data_->_tmp15_;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp17_ = NULL;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp17_ = g_new0 (gchar*, (_data_->_tmp16_ + 1) + 1);
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->package_ids_length1 = 0;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_package_ids_size_ = 0;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->package_ids = _data_->_tmp17_;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->package_ids_length1 = _data_->_tmp16_ + 1;
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_package_ids_size_ = _data_->package_ids_length1;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp18_ = NULL;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp18__length1 = 0;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp18_ = _data_->package_ids;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp18__length1 = _data_->package_ids_length1;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp19_ = NULL;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp19_ = _data_->package_array;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp20_ = 0;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp20_ = g_ptr_array_get_length (_data_->_tmp19_);
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp21_ = 0;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp21_ = _data_->_tmp20_;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_data_->_tmp18_[_data_->_tmp21_]);
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp18_[_data_->_tmp21_] = NULL;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp22_ = NULL;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp22_ = _data_->_tmp18_[_data_->_tmp21_];
-#line 8078 "ui.c"
+#line 8073 "ui.c"
 	{
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->i = 0;
-#line 8082 "ui.c"
+#line 8077 "ui.c"
 		{
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_data_->_tmp23_ = TRUE;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_data_->_tmp23_) {
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_data_->_tmp24_ = 0;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_data_->_tmp24_ = _data_->i;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_data_->i = _data_->_tmp24_ + 1;
-#line 8096 "ui.c"
+#line 8091 "ui.c"
 				}
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp23_ = FALSE;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp25_ = 0;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp25_ = _data_->i;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp26_ = NULL;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp26_ = _data_->package_array;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp27_ = 0;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp27_ = g_ptr_array_get_length (_data_->_tmp26_);
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp28_ = 0;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp28_ = _data_->_tmp27_;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!(_data_->_tmp25_ < _data_->_tmp28_)) {
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 8120 "ui.c"
+#line 8115 "ui.c"
 				}
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp29_ = NULL;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp29__length1 = 0;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp29_ = _data_->package_ids;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp29__length1 = _data_->package_ids_length1;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp30_ = 0;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp30_ = _data_->i;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp31_ = NULL;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp31_ = _data_->package_array;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp32_ = NULL;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp32__length1 = 0;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp32_ = _data_->_tmp31_->pdata;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp32__length1 = (gint) _data_->_tmp31_->len;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp33_ = 0;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp33_ = _data_->i;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp34_ = NULL;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp34_ = _data_->_tmp32_[_data_->_tmp33_];
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp35_ = NULL;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp35_ = pk_package_get_id (_data_->_tmp34_);
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp36_ = NULL;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp36_ = g_strdup (_data_->_tmp35_);
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (_data_->_tmp29_[_data_->_tmp30_]);
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp29_[_data_->_tmp30_] = _data_->_tmp36_;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp37_ = NULL;
-#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_data_->_tmp37_ = _data_->_tmp29_[_data_->_tmp30_];
-#line 8170 "ui.c"
+#line 8165 "ui.c"
 			}
 		}
 	}
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp39_ = NULL;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp39_ = _data_->task;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp40_ = NULL;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp40__length1 = 0;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp40_ = _data_->package_ids;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp40__length1 = _data_->package_ids_length1;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp41_ = NULL;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp41__target = NULL;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp41_ = _data_->progress_callback;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp41__target = _data_->progress_callback_target;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_state_ = 2;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	pk_task_install_packages_async (_data_->_tmp39_, _data_->_tmp40_, NULL, _data_->_tmp41_, _data_->_tmp41__target, user_interface_install_packages_ready, _data_);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return FALSE;
-#line 8200 "ui.c"
+#line 8195 "ui.c"
 	_state_2:
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp42_ = NULL;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp42_ = pk_task_generic_finish (_data_->_tmp39_, _data_->_res_, &_data_->_inner_error_);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp38_ = _data_->_tmp42_;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_error_free (_data_->_inner_error_);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_data_->package_ids = (_vala_array_free (_data_->package_ids, _data_->package_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_ptr_array_unref0 (_data_->package_array);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data_->_tmp1_);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data_->results);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data_->task);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_data_->_state_ == 0) {
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 8228 "ui.c"
+#line 8223 "ui.c"
 		} else {
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_simple_async_result_complete (_data_->_async_result);
-#line 8232 "ui.c"
+#line 8227 "ui.c"
 		}
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_object_unref (_data_->_async_result);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return FALSE;
-#line 8238 "ui.c"
+#line 8233 "ui.c"
 	}
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp43_ = NULL;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp43_ = _data_->_tmp38_;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->_tmp38_ = NULL;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->result = _data_->_tmp43_;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_data_->_tmp38_);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->package_ids = (_vala_array_free (_data_->package_ids, _data_->package_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_ptr_array_unref0 (_data_->package_array);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_data_->_tmp1_);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_data_->results);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_data_->task);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_data_->_state_ == 0) {
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 8264 "ui.c"
+#line 8259 "ui.c"
 	} else {
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_simple_async_result_complete (_data_->_async_result);
-#line 8268 "ui.c"
+#line 8263 "ui.c"
 	}
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_unref (_data_->_async_result);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return FALSE;
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_data_->_tmp38_);
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data_->package_ids = (_vala_array_free (_data_->package_ids, _data_->package_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_ptr_array_unref0 (_data_->package_array);
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_data_->_tmp1_);
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_data_->results);
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_data_->task);
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_data_->_state_ == 0) {
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 8290 "ui.c"
+#line 8285 "ui.c"
 	} else {
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_simple_async_result_complete (_data_->_async_result);
-#line 8294 "ui.c"
+#line 8289 "ui.c"
 	}
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_unref (_data_->_async_result);
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return FALSE;
-#line 8300 "ui.c"
+#line 8295 "ui.c"
 }
 
 
-static gboolean user_interface_simple_scan_window_window_state_event_cb (UserInterface* self, GtkWidget* widget, GdkEventWindowState* event) {
+static gboolean user_interface_real_window_state_event (GtkWidget* base, GdkEventWindowState* event) {
+	UserInterface * self;
 	gboolean result = FALSE;
-	GdkEventWindowState* _tmp0_ = NULL;
-	GdkWindowState _tmp1_ = 0;
-#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _result_ = FALSE;
+	GdkEventWindowState* _tmp2_ = NULL;
+	GdkWindowState _tmp3_ = 0;
+	GdkEventWindowState* _tmp6_ = NULL;
+	GdkWindowState _tmp7_ = 0;
+#line 1703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = (UserInterface*) base;
+#line 1703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
+#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_result_ = GDK_EVENT_PROPAGATE;
 #line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = event;
-#line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = _tmp0_->changed_mask;
-#line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if ((_tmp1_ & GDK_WINDOW_STATE_MAXIMIZED) != 0) {
-#line 8320 "ui.c"
-		GdkEventWindowState* _tmp2_ = NULL;
-		GdkWindowState _tmp3_ = 0;
-#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = event;
-#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = _tmp2_->new_window_state;
-#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->window_is_maximized = (_tmp3_ & GDK_WINDOW_STATE_MAXIMIZED) != 0;
-#line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_save_state (self, FALSE);
-#line 8331 "ui.c"
+	if (GTK_WIDGET_CLASS (user_interface_parent_class)->window_state_event != NULL) {
+#line 8315 "ui.c"
+		GdkEventWindowState* _tmp0_ = NULL;
+		gboolean _tmp1_ = FALSE;
+#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp0_ = event;
+#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp1_ = GTK_WIDGET_CLASS (user_interface_parent_class)->window_state_event ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), _tmp0_);
+#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_result_ = _tmp1_;
+#line 8324 "ui.c"
 	}
+#line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = event;
+#line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _tmp2_->changed_mask;
+#line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if ((_tmp3_ & GDK_WINDOW_STATE_MAXIMIZED) != 0) {
+#line 8332 "ui.c"
+		GdkEventWindowState* _tmp4_ = NULL;
+		GdkWindowState _tmp5_ = 0;
 #line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = FALSE;
+		_tmp4_ = event;
 #line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = _tmp4_->new_window_state;
+#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		self->priv->window_is_maximized = (_tmp5_ & GDK_WINDOW_STATE_MAXIMIZED) != 0;
+#line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_save_state (self, FALSE);
+#line 8343 "ui.c"
+	}
+#line 1715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = event;
+#line 1715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = _tmp6_->changed_mask;
+#line 1715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if ((_tmp7_ & GDK_WINDOW_STATE_FULLSCREEN) != 0) {
+#line 8351 "ui.c"
+		GdkEventWindowState* _tmp8_ = NULL;
+		GdkWindowState _tmp9_ = 0;
+#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp8_ = event;
+#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp9_ = _tmp8_->new_window_state;
+#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		self->priv->window_is_fullscreen = (_tmp9_ & GDK_WINDOW_STATE_FULLSCREEN) != 0;
+#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_save_state (self, FALSE);
+#line 8362 "ui.c"
+	}
+#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = _result_;
+#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 8337 "ui.c"
-}
-
-
-static gboolean _user_interface_simple_scan_window_window_state_event_cb_gtk_widget_window_state_event (GtkWidget* _sender, GdkEventWindowState* event, gpointer self) {
-	gboolean result;
-	result = user_interface_simple_scan_window_window_state_event_cb ((UserInterface*) self, _sender, event);
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 8346 "ui.c"
+#line 8368 "ui.c"
 }
 
 
 static gboolean user_interface_window_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_on_quit (self);
-#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = !_tmp0_;
-#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 8365 "ui.c"
+#line 8387 "ui.c"
 }
 
 
@@ -8384,7 +8406,7 @@ static gboolean _user_interface_window_delete_event_cb_gtk_widget_delete_event (
 	result = user_interface_window_delete_event_cb ((UserInterface*) self, _sender, event);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 8374 "ui.c"
+#line 8396 "ui.c"
 }
 
 
@@ -8398,37 +8420,37 @@ static void user_interface_page_size_changed_cb (UserInterface* self, Page* page
 	Page* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_width (_tmp0_);
-#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_width = _tmp2_;
-#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page;
-#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_get_height (_tmp3_);
-#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_height = _tmp5_;
-#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = page;
-#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = page_get_dpi (_tmp6_);
-#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _tmp7_;
-#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_dpi = _tmp8_;
-#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, FALSE);
-#line 8418 "ui.c"
+#line 8440 "ui.c"
 }
 
 
@@ -8436,35 +8458,35 @@ static void user_interface_page_scan_direction_changed_cb (UserInterface* self,
 	Page* _tmp0_ = NULL;
 	ScanDirection _tmp1_ = 0;
 	ScanDirection _tmp2_ = 0;
-#line 1729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_scan_direction (_tmp0_);
-#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_scan_direction = _tmp2_;
-#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, FALSE);
-#line 8440 "ui.c"
+#line 8462 "ui.c"
 }
 
 
 static void _user_interface_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self) {
-#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_size_changed_cb ((UserInterface*) self, _sender);
-#line 8447 "ui.c"
+#line 8469 "ui.c"
 }
 
 
 static void _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self) {
-#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_scan_direction_changed_cb ((UserInterface*) self, _sender);
-#line 8454 "ui.c"
+#line 8476 "ui.c"
 }
 
 
@@ -8475,46 +8497,46 @@ static void user_interface_page_added_cb (UserInterface* self, Book* book, Page*
 	ScanDirection _tmp3_ = 0;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_size_changed_cb (self, _tmp0_);
-#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page;
-#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page_get_scan_direction (_tmp1_);
-#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_scan_direction = _tmp3_;
-#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp4_, "size-changed", (GCallback) _user_interface_page_size_changed_cb_page_size_changed, self, 0);
-#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp5_, "scan-direction-changed", (GCallback) _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed, self, 0);
-#line 1742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 8493 "ui.c"
+#line 8515 "ui.c"
 }
 
 
 static void user_interface_reordered_cb (UserInterface* self, Book* book) {
-#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 8504 "ui.c"
+#line 8526 "ui.c"
 }
 
 
@@ -8526,39 +8548,39 @@ static void user_interface_page_removed_cb (UserInterface* self, Book* book, Pag
 	Book* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
 	guint _tmp6_ = 0U;
-#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("size-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _user_interface_page_size_changed_cb_page_size_changed, self);
-#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page;
-#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("scan-direction-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed, self);
-#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book;
-#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_get_n_pages (_tmp4_);
-#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _tmp5_;
-#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp6_ == ((guint) 0)) {
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_add_default_page (self);
-#line 8544 "ui.c"
+#line 8566 "ui.c"
 	}
-#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 8548 "ui.c"
+#line 8570 "ui.c"
 }
 
 
@@ -8580,79 +8602,79 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 	gint _scan_resolutions_size_ = 0;
 	gint* _tmp10_ = NULL;
 	gint _tmp10__length1 = 0;
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (combo != NULL);
-#line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp0_;
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = combo;
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = renderer;
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp1_, (GtkCellRenderer*) _tmp2_, TRUE);
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = combo;
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = renderer;
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp3_, (GtkCellRenderer*) _tmp4_, "text", 1);
-#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = combo;
-#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = gtk_combo_box_get_model (_tmp5_);
-#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _tmp6_;
-#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, gtk_list_store_get_type ()) ? ((GtkListStore*) _tmp7_) : NULL);
-#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	model = _tmp8_;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = g_new0 (gint, 6);
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[0] = 75;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[1] = 150;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[2] = 300;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[3] = 600;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[4] = 1200;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[5] = 2400;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions = _tmp9_;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions_length1 = 6;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_resolutions_size_ = scan_resolutions_length1;
-#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = scan_resolutions;
-#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10__length1 = scan_resolutions_length1;
-#line 8626 "ui.c"
+#line 8648 "ui.c"
 	{
 		gint* dpi_collection = NULL;
 		gint dpi_collection_length1 = 0;
 		gint _dpi_collection_size_ = 0;
 		gint dpi_it = 0;
-#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi_collection = _tmp10_;
-#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi_collection_length1 = _tmp10__length1;
-#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		for (dpi_it = 0; dpi_it < _tmp10__length1; dpi_it = dpi_it + 1) {
-#line 8638 "ui.c"
+#line 8660 "ui.c"
 			gint dpi = 0;
-#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			dpi = dpi_collection[dpi_it];
-#line 8642 "ui.c"
+#line 8664 "ui.c"
 			{
 				gchar* label = NULL;
 				gint _tmp11_ = 0;
@@ -8666,133 +8688,133 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 				const gchar* _tmp32_ = NULL;
 				gint _tmp33_ = 0;
 				gint _tmp34_ = 0;
-#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp11_ = dpi;
-#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = default_dpi;
-#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp11_ == _tmp12_) {
-#line 8662 "ui.c"
+#line 8684 "ui.c"
 					const gchar* _tmp13_ = NULL;
 					gint _tmp14_ = 0;
 					gchar* _tmp15_ = NULL;
-#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp13_ = _ ("%d dpi (default)");
-#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp14_ = dpi;
-#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp15_ = g_strdup_printf (_tmp13_, _tmp14_);
-#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (label);
-#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					label = _tmp15_;
-#line 8676 "ui.c"
+#line 8698 "ui.c"
 				} else {
 					gint _tmp16_ = 0;
-#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp16_ = dpi;
-#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (_tmp16_ == 75) {
-#line 8683 "ui.c"
+#line 8705 "ui.c"
 						const gchar* _tmp17_ = NULL;
 						gint _tmp18_ = 0;
 						gchar* _tmp19_ = NULL;
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp17_ = _ ("%d dpi (draft)");
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp18_ = dpi;
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp19_ = g_strdup_printf (_tmp17_, _tmp18_);
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_g_free0 (label);
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						label = _tmp19_;
-#line 8697 "ui.c"
+#line 8719 "ui.c"
 					} else {
 						gint _tmp20_ = 0;
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp20_ = dpi;
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						if (_tmp20_ == 1200) {
-#line 8704 "ui.c"
+#line 8726 "ui.c"
 							const gchar* _tmp21_ = NULL;
 							gint _tmp22_ = 0;
 							gchar* _tmp23_ = NULL;
-#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp21_ = _ ("%d dpi (high resolution)");
-#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp22_ = dpi;
-#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp23_ = g_strdup_printf (_tmp21_, _tmp22_);
-#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (label);
-#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							label = _tmp23_;
-#line 8718 "ui.c"
+#line 8740 "ui.c"
 						} else {
 							const gchar* _tmp24_ = NULL;
 							gint _tmp25_ = 0;
 							gchar* _tmp26_ = NULL;
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp24_ = _ ("%d dpi");
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp25_ = dpi;
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp26_ = g_strdup_printf (_tmp24_, _tmp25_);
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (label);
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							label = _tmp26_;
-#line 8733 "ui.c"
+#line 8755 "ui.c"
 						}
 					}
 				}
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp27_ = model;
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_list_store_append (_tmp27_, &_tmp28_);
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				iter = _tmp28_;
-#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp29_ = model;
-#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp30_ = iter;
-#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp31_ = dpi;
-#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp32_ = label;
-#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_list_store_set (_tmp29_, &_tmp30_, 0, _tmp31_, 1, _tmp32_, -1, -1);
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp33_ = dpi;
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp34_ = current_dpi;
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp33_ == _tmp34_) {
-#line 8759 "ui.c"
+#line 8781 "ui.c"
 					GtkComboBox* _tmp35_ = NULL;
 					GtkTreeIter _tmp36_ = {0};
-#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp35_ = combo;
-#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp36_ = iter;
-#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_combo_box_set_active_iter (_tmp35_, &_tmp36_);
-#line 8768 "ui.c"
+#line 8790 "ui.c"
 				}
-#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (label);
-#line 8772 "ui.c"
+#line 8794 "ui.c"
 			}
 		}
 	}
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions = (g_free (scan_resolutions), NULL);
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (model);
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 8782 "ui.c"
+#line 8804 "ui.c"
 }
 
 
@@ -8813,128 +8835,128 @@ static void user_interface_needs_saving_cb (UserInterface* self, Book* book) {
 	gboolean _tmp13_ = FALSE;
 	gboolean _tmp14_ = FALSE;
 	GtkMenuItem* _tmp16_ = NULL;
-#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->save_menuitem;
-#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book;
-#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_needs_saving (_tmp1_);
-#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp3_);
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->save_button;
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book;
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_needs_saving (_tmp5_);
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _tmp6_;
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp4_, _tmp7_);
-#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->save_toolbutton;
-#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = book;
-#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = book_get_needs_saving (_tmp9_);
-#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = _tmp10_;
-#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp8_, _tmp11_);
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = book;
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = book_get_needs_saving (_tmp12_);
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = _tmp13_;
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp14_) {
-#line 8845 "ui.c"
+#line 8867 "ui.c"
 		GtkMenuItem* _tmp15_ = NULL;
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = self->priv->save_as_menuitem;
-#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp15_, TRUE);
-#line 8851 "ui.c"
+#line 8873 "ui.c"
 	}
-#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = self->priv->copy_to_clipboard_menuitem;
-#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp16_, TRUE);
-#line 8857 "ui.c"
+#line 8879 "ui.c"
 }
 
 
 static void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self) {
-#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_info_bar_response_cb ((UserInterface*) self, _sender, response_id);
-#line 8864 "ui.c"
+#line 8886 "ui.c"
 }
 
 
 static void __lambda14_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_text_dpi (self);
-#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "text-dpi", _tmp1_);
-#line 8877 "ui.c"
+#line 8899 "ui.c"
 }
 
 
 static void ___lambda14__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda14_ ((UserInterface*) self);
-#line 8884 "ui.c"
+#line 8906 "ui.c"
 }
 
 
 static void __lambda15_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_photo_dpi (self);
-#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "photo-dpi", _tmp1_);
-#line 8897 "ui.c"
+#line 8919 "ui.c"
 }
 
 
 static void ___lambda15__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda15_ ((UserInterface*) self);
-#line 8904 "ui.c"
+#line 8926 "ui.c"
 }
 
 
 static void __lambda16_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	ScanType _tmp1_ = 0;
-#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_page_side (self);
-#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_enum (_tmp0_, "page-side", (gint) _tmp1_);
-#line 8917 "ui.c"
+#line 8939 "ui.c"
 }
 
 
 static void ___lambda16__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda16_ ((UserInterface*) self);
-#line 8924 "ui.c"
+#line 8946 "ui.c"
 }
 
 
@@ -8945,28 +8967,28 @@ static void __lambda17_ (UserInterface* self) {
 	gint _tmp1_ = 0;
 	GSettings* _tmp2_ = NULL;
 	GSettings* _tmp3_ = NULL;
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_get_paper_size (self, &_tmp0_, &_tmp1_);
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	w = _tmp0_;
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	h = _tmp1_;
-#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->settings;
-#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp2_, "paper-width", w);
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->settings;
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp3_, "paper-height", h);
-#line 8949 "ui.c"
+#line 8971 "ui.c"
 }
 
 
 static void ___lambda17__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda17_ ((UserInterface*) self);
-#line 8956 "ui.c"
+#line 8978 "ui.c"
 }
 
 
@@ -8974,22 +8996,22 @@ static void __lambda18_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_brightness (self);
-#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "brightness", _tmp2_);
-#line 8972 "ui.c"
+#line 8994 "ui.c"
 }
 
 
 static void ___lambda18__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda18_ ((UserInterface*) self);
-#line 8979 "ui.c"
+#line 9001 "ui.c"
 }
 
 
@@ -8997,22 +9019,22 @@ static void __lambda19_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_contrast (self);
-#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "contrast", _tmp2_);
-#line 8995 "ui.c"
+#line 9017 "ui.c"
 }
 
 
 static void ___lambda19__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda19_ ((UserInterface*) self);
-#line 9002 "ui.c"
+#line 9024 "ui.c"
 }
 
 
@@ -9020,50 +9042,50 @@ static void __lambda20_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "jpeg-quality", _tmp2_);
-#line 9018 "ui.c"
+#line 9040 "ui.c"
 }
 
 
 static void ___lambda20__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda20_ ((UserInterface*) self);
-#line 9025 "ui.c"
+#line 9047 "ui.c"
 }
 
 
 static void _user_interface_page_selected_cb_book_view_page_selected (BookView* _sender, Page* page, gpointer self) {
-#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_selected_cb ((UserInterface*) self, _sender, page);
-#line 9032 "ui.c"
+#line 9054 "ui.c"
 }
 
 
 static void _user_interface_show_page_cb_book_view_show_page (BookView* _sender, Page* page, gpointer self) {
-#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_page_cb ((UserInterface*) self, _sender, page);
-#line 9039 "ui.c"
+#line 9061 "ui.c"
 }
 
 
 static void _user_interface_show_page_menu_cb_book_view_show_menu (BookView* _sender, gpointer self) {
-#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_page_menu_cb ((UserInterface*) self, _sender);
-#line 9046 "ui.c"
+#line 9068 "ui.c"
 }
 
 
 static void _user_interface_book_saving_cb_book_saving (Book* _sender, gint i, gpointer self) {
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_book_saving_cb ((UserInterface*) self, i);
-#line 9053 "ui.c"
+#line 9075 "ui.c"
 }
 
 
@@ -9270,80 +9292,81 @@ static void user_interface_load (UserInterface* self) {
 	gint _tmp235_ = 0;
 	gint _tmp236_ = 0;
 	gboolean _tmp237_ = FALSE;
-	const gchar* _tmp238_ = NULL;
-	ProgressBarDialog* _tmp239_ = NULL;
-	Book* _tmp240_ = NULL;
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp238_ = FALSE;
+	const gchar* _tmp239_ = NULL;
+	ProgressBarDialog* _tmp240_ = NULL;
+	Book* _tmp241_ = NULL;
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_icon_theme_get_default ();
-#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_icon_theme_append_search_path (_tmp0_, ICON_DIR);
-#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_default_icon_name ("scanner");
-#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_application_get_default ();
-#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_application_get_type ()) ? ((GtkApplication*) _tmp1_) : NULL);
-#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	app = _tmp2_;
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = user_interface_is_desktop (self, "Unity");
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp6_) {
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = TRUE;
-#line 9283 "ui.c"
+#line 9306 "ui.c"
 	} else {
 		gboolean _tmp7_ = FALSE;
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = user_interface_is_desktop (self, "XFCE");
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp7_;
-#line 9290 "ui.c"
+#line 9313 "ui.c"
 	}
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_) {
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = TRUE;
-#line 9296 "ui.c"
+#line 9319 "ui.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = user_interface_is_desktop (self, "MATE");
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = _tmp8_;
-#line 9303 "ui.c"
+#line 9326 "ui.c"
 	}
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = TRUE;
-#line 9309 "ui.c"
+#line 9332 "ui.c"
 	} else {
 		gboolean _tmp9_ = FALSE;
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = user_interface_is_desktop (self, "LXDE");
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _tmp9_;
-#line 9316 "ui.c"
+#line 9339 "ui.c"
 	}
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 9320 "ui.c"
+#line 9343 "ui.c"
 		GtkMenuBar* _tmp10_ = NULL;
 		GtkToolbar* _tmp11_ = NULL;
-#line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_window_set_titlebar ((GtkWindow*) self, NULL);
-#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = self->priv->menubar;
-#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_visible ((GtkWidget*) _tmp10_, TRUE);
-#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = self->priv->toolbar;
-#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
-#line 9333 "ui.c"
+#line 9356 "ui.c"
 	} else {
 		GtkApplication* _tmp12_ = NULL;
 		GMenu* appmenu = NULL;
@@ -9395,817 +9418,827 @@ static void user_interface_load (UserInterface* self) {
 		GtkApplication* _tmp56_ = NULL;
 		GtkApplication* _tmp57_ = NULL;
 		GtkApplication* _tmp58_ = NULL;
-#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = app;
-#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_action_map_add_action_entries ((GActionMap*) _tmp12_, USER_INTERFACE_action_entries, G_N_ELEMENTS (USER_INTERFACE_action_entries), self);
-#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = g_menu_new ();
-#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		appmenu = _tmp13_;
-#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = g_menu_new ();
-#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp14_;
-#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = appmenu;
-#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = section;
-#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp15_, NULL, (GMenuModel*) _tmp16_);
-#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = section;
-#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp18_ = _ ("New Document");
-#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp17_, _tmp18_, "app.new_document");
-#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = g_menu_new ();
-#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp19_;
-#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp20_ = appmenu;
-#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp21_ = section;
-#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp20_, NULL, (GMenuModel*) _tmp21_);
-#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp22_ = g_menu_new ();
-#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		menu = _tmp22_;
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp23_ = section;
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp24_ = _ ("Document");
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp25_ = menu;
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_submenu (_tmp23_, _tmp24_, (GMenuModel*) _tmp25_);
-#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp26_ = menu;
-#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp27_ = _ ("Reorder Pages");
-#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp26_, _tmp27_, "app.reorder");
-#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp28_ = menu;
-#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp29_ = _ ("Save");
-#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp28_, _tmp29_, "app.save");
-#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp30_ = menu;
-#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp31_ = _ ("Save As...");
-#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp30_, _tmp31_, "app.save_as");
-#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp32_ = menu;
-#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp33_ = _ ("Email...");
-#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp32_, _tmp33_, "app.email");
-#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp34_ = menu;
-#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp35_ = _ ("Print...");
-#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp34_, _tmp35_, "app.print");
-#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp36_ = g_menu_new ();
-#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp36_;
-#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp37_ = appmenu;
-#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp38_ = section;
-#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp37_, NULL, (GMenuModel*) _tmp38_);
-#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp39_ = section;
-#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp40_ = _ ("Preferences");
-#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp39_, _tmp40_, "app.preferences");
-#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp41_ = g_menu_new ();
-#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp41_;
-#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp42_ = appmenu;
-#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp43_ = section;
-#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp42_, NULL, (GMenuModel*) _tmp43_);
-#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp44_ = section;
-#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp45_ = _ ("Help");
-#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp44_, _tmp45_, "app.help");
-#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp46_ = section;
-#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp47_ = _ ("About");
-#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp46_, _tmp47_, "app.about");
-#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp48_ = section;
-#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp49_ = _ ("Quit");
-#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp48_, _tmp49_, "app.quit");
-#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp50_ = app;
-#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp51_ = appmenu;
-#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_set_app_menu (_tmp50_, (GMenuModel*) _tmp51_);
-#line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp52_ = app;
-#line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp52_, "<Ctrl>N", "app.new_document", NULL);
-#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp53_ = app;
-#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp53_, "<Ctrl>S", "app.save", NULL);
-#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp54_ = app;
-#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp54_, "<Shift><Ctrl>S", "app.save_as", NULL);
-#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp55_ = app;
-#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp55_, "<Ctrl>E", "app.email", NULL);
-#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp56_ = app;
-#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp56_, "<Ctrl>P", "app.print", NULL);
-#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp57_ = app;
-#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp57_, "F1", "app.help", NULL);
-#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp58_ = app;
-#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp58_, "<Ctrl>Q", "app.quit", NULL);
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (menu);
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (appmenu);
-#line 9551 "ui.c"
+#line 9574 "ui.c"
 	}
-#line 1858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp59_ = app;
-#line 1858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_application_add_window (_tmp59_, (GtkWindow*) self);
-#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp60_ = (GtkInfoBar*) gtk_info_bar_new ();
-#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp60_);
-#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar);
-#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar = _tmp60_;
-#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp61_ = self->priv->info_bar;
-#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp61_, "response", (GCallback) _user_interface_info_bar_response_cb_gtk_info_bar_response, self, 0);
-#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp62_ = self->priv->main_vbox;
-#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp63_ = self->priv->info_bar;
-#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp62_, (GtkWidget*) _tmp63_, FALSE, TRUE, (guint) 0);
-#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp64_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp64_);
-#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	hbox = _tmp64_;
-#line 1865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp65_ = self->priv->info_bar;
-#line 1865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp66_ = gtk_info_bar_get_content_area (_tmp65_);
-#line 1865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp67_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp66_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp66_) : NULL);
-#line 1865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	content_area = _tmp67_;
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp68_ = content_area;
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp69_ = hbox;
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add (_tmp68_, (GtkWidget*) _tmp69_);
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp70_ = hbox;
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp70_, TRUE);
-#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp71_ = (GtkImage*) gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG);
-#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp71_);
-#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_image);
-#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_image = _tmp71_;
-#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp72_ = hbox;
-#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp73_ = self->priv->info_bar_image;
-#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp72_, (GtkWidget*) _tmp73_, FALSE, TRUE, (guint) 0);
-#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp74_ = self->priv->info_bar_image;
-#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp74_, TRUE);
-#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp75_ = (GtkLabel*) gtk_label_new (NULL);
-#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp75_);
-#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_label);
-#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_label = _tmp75_;
-#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp76_ = self->priv->info_bar_label;
-#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_misc_set_alignment ((GtkMisc*) _tmp76_, 0.0f, 0.5f);
-#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp77_ = hbox;
-#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp78_ = self->priv->info_bar_label;
-#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp77_, (GtkWidget*) _tmp78_, TRUE, TRUE, (guint) 0);
-#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp79_ = self->priv->info_bar_label;
-#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp79_, TRUE);
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp80_ = self->priv->info_bar;
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp81_ = _ ("_Close");
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp82_ = gtk_info_bar_add_button (_tmp80_, _tmp81_, (gint) GTK_RESPONSE_CLOSE);
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp82_, gtk_button_get_type ()) ? ((GtkButton*) _tmp82_) : NULL);
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_close_button);
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_close_button = _tmp83_;
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp84_ = self->priv->info_bar;
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp85_ = _ ("Change _Scanner");
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp86_ = gtk_info_bar_add_button (_tmp84_, _tmp85_, 1);
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp87_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp86_, gtk_button_get_type ()) ? ((GtkButton*) _tmp86_) : NULL);
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_change_scanner_button);
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_change_scanner_button = _tmp87_;
-#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp88_ = self->priv->info_bar;
-#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp89_ = _ ("_Install Drivers");
-#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp90_ = gtk_info_bar_add_button (_tmp88_, _tmp89_, 2);
-#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp91_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp90_, gtk_button_get_type ()) ? ((GtkButton*) _tmp90_) : NULL);
-#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_install_button);
-#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_install_button = _tmp91_;
-#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp92_ = self->priv->paper_size_model;
-#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp92_, &_tmp93_);
-#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp93_;
-#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp94_ = self->priv->paper_size_model;
-#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp95_ = iter;
-#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp96_ = _ ("Automatic");
-#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp94_, &_tmp95_, 0, 0, 1, 0, 2, _tmp96_, -1, -1);
-#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp97_ = self->priv->paper_size_model;
-#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp97_, &_tmp98_);
-#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp98_;
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp99_ = self->priv->paper_size_model;
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp100_ = iter;
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp99_, &_tmp100_, 0, 1050, 1, 1480, 2, "A6", -1, -1);
-#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp101_ = self->priv->paper_size_model;
-#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp101_, &_tmp102_);
-#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp102_;
-#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp103_ = self->priv->paper_size_model;
-#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp104_ = iter;
-#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp103_, &_tmp104_, 0, 1480, 1, 2100, 2, "A5", -1, -1);
-#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp105_ = self->priv->paper_size_model;
-#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp105_, &_tmp106_);
-#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp106_;
-#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp107_ = self->priv->paper_size_model;
-#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp108_ = iter;
-#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp107_, &_tmp108_, 0, 2100, 1, 2970, 2, "A4", -1, -1);
-#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp109_ = self->priv->paper_size_model;
-#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp109_, &_tmp110_);
-#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp110_;
-#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp111_ = self->priv->paper_size_model;
-#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp112_ = iter;
-#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp111_, &_tmp112_, 0, 2159, 1, 2794, 2, "Letter", -1, -1);
-#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp113_ = self->priv->paper_size_model;
-#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp113_, &_tmp114_);
-#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp114_;
-#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp115_ = self->priv->paper_size_model;
-#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp116_ = iter;
-#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp115_, &_tmp116_, 0, 2159, 1, 3556, 2, "Legal", -1, -1);
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp117_ = self->priv->paper_size_model;
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp117_, &_tmp118_);
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp118_;
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp119_ = self->priv->paper_size_model;
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp120_ = iter;
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp119_, &_tmp120_, 0, 1016, 1, 1524, 2, "4×6", -1, -1);
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp121_ = self->priv->settings;
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp122_ = g_settings_get_int (_tmp121_, "text-dpi");
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = _tmp122_;
-#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp123_ = dpi;
-#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp123_ <= 0) {
-#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-#line 9773 "ui.c"
+#line 9796 "ui.c"
 	}
-#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp124_ = self->priv->text_dpi_combo;
-#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp125_ = dpi;
-#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_dpi_combo (self, _tmp124_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp125_);
-#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp126_ = self->priv->text_dpi_combo;
-#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp126_, "changed", (GCallback) ___lambda14__gtk_combo_box_changed, self, 0);
-#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp127_ = self->priv->settings;
-#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp128_ = g_settings_get_int (_tmp127_, "photo-dpi");
-#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = _tmp128_;
-#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp129_ = dpi;
-#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp129_ <= 0) {
-#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-#line 9797 "ui.c"
+#line 9820 "ui.c"
 	}
-#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp130_ = self->priv->photo_dpi_combo;
-#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp131_ = dpi;
-#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_dpi_combo (self, _tmp130_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp131_);
-#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp132_ = self->priv->photo_dpi_combo;
-#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp132_, "changed", (GCallback) ___lambda15__gtk_combo_box_changed, self, 0);
-#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp133_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp133_);
-#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp133_;
-#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp134_ = self->priv->device_combo;
-#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp135_ = renderer;
-#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp134_, (GtkCellRenderer*) _tmp135_, TRUE);
-#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp136_ = self->priv->device_combo;
-#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp137_ = renderer;
-#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp136_, (GtkCellRenderer*) _tmp137_, "text", 1);
-#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp138_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp138_);
-#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp138_;
-#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp139_ = self->priv->page_side_combo;
-#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp140_ = renderer;
-#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp139_, (GtkCellRenderer*) _tmp140_, TRUE);
-#line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp141_ = self->priv->page_side_combo;
-#line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp142_ = renderer;
-#line 1919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp141_, (GtkCellRenderer*) _tmp142_, "text", 1);
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp143_ = self->priv->settings;
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp144_ = g_settings_get_enum (_tmp143_, "page-side");
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_page_side (self, (ScanType) _tmp144_);
-#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp145_ = self->priv->page_side_combo;
-#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp145_, "changed", (GCallback) ___lambda16__gtk_combo_box_changed, self, 0);
-#line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp146_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp146_);
-#line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp146_;
-#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp147_ = self->priv->paper_size_combo;
-#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp148_ = renderer;
-#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp147_, (GtkCellRenderer*) _tmp148_, TRUE);
-#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp149_ = self->priv->paper_size_combo;
-#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp150_ = renderer;
-#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp149_, (GtkCellRenderer*) _tmp150_, "text", 2);
-#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp151_ = self->priv->settings;
-#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp152_ = g_settings_get_int (_tmp151_, "paper-width");
-#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	paper_width = _tmp152_;
-#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp153_ = self->priv->settings;
-#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp154_ = g_settings_get_int (_tmp153_, "paper-height");
-#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	paper_height = _tmp154_;
-#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp155_ = paper_width;
-#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp156_ = paper_height;
-#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_paper_size (self, _tmp155_, _tmp156_);
-#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp157_ = self->priv->paper_size_combo;
-#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp157_, "changed", (GCallback) ___lambda17__gtk_combo_box_changed, self, 0);
-#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp158_ = self->priv->brightness_adjustment;
-#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp159_ = gtk_adjustment_get_lower (_tmp158_);
-#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp160_ = _tmp159_;
-#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	lower = _tmp160_;
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp161_ = _ ("Darker");
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp162_ = g_strdup_printf ("<small>%s</small>", _tmp161_);
-#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	darker_label = _tmp162_;
-#line 1939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp163_ = self->priv->brightness_adjustment;
-#line 1939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp164_ = gtk_adjustment_get_upper (_tmp163_);
-#line 1939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp165_ = _tmp164_;
-#line 1939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	upper = _tmp165_;
-#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp166_ = _ ("Lighter");
-#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp167_ = g_strdup_printf ("<small>%s</small>", _tmp166_);
-#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	lighter_label = _tmp167_;
-#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp168_ = self->priv->brightness_scale;
-#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp169_ = lower;
-#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp170_ = darker_label;
-#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp168_, _tmp169_, GTK_POS_BOTTOM, _tmp170_);
-#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp171_ = self->priv->brightness_scale;
-#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp171_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
-#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp172_ = self->priv->brightness_scale;
-#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp173_ = upper;
-#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp174_ = lighter_label;
-#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp172_, _tmp173_, GTK_POS_BOTTOM, _tmp174_);
-#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp175_ = self->priv->settings;
-#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp176_ = g_settings_get_int (_tmp175_, "brightness");
-#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_brightness (self, _tmp176_);
-#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp177_ = self->priv->brightness_adjustment;
-#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp177_, "value-changed", (GCallback) ___lambda18__gtk_adjustment_value_changed, self, 0);
-#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp178_ = self->priv->contrast_adjustment;
-#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp179_ = gtk_adjustment_get_lower (_tmp178_);
-#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp180_ = _tmp179_;
-#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	lower = _tmp180_;
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp181_ = _ ("Less");
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp182_ = g_strdup_printf ("<small>%s</small>", _tmp181_);
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	less_label = _tmp182_;
-#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp183_ = self->priv->contrast_adjustment;
-#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp184_ = gtk_adjustment_get_upper (_tmp183_);
-#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp185_ = _tmp184_;
-#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	upper = _tmp185_;
-#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp186_ = _ ("More");
-#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp187_ = g_strdup_printf ("<small>%s</small>", _tmp186_);
-#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	more_label = _tmp187_;
-#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp188_ = self->priv->contrast_scale;
-#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp189_ = lower;
-#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp190_ = less_label;
-#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp188_, _tmp189_, GTK_POS_BOTTOM, _tmp190_);
-#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp191_ = self->priv->contrast_scale;
-#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp191_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
-#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp192_ = self->priv->contrast_scale;
-#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp193_ = upper;
-#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp194_ = more_label;
-#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp192_, _tmp193_, GTK_POS_BOTTOM, _tmp194_);
-#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp195_ = self->priv->settings;
-#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp196_ = g_settings_get_int (_tmp195_, "contrast");
-#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_contrast (self, _tmp196_);
-#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp197_ = self->priv->contrast_adjustment;
-#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp197_, "value-changed", (GCallback) ___lambda19__gtk_adjustment_value_changed, self, 0);
-#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp198_ = self->priv->quality_adjustment;
-#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp199_ = gtk_adjustment_get_lower (_tmp198_);
-#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp200_ = _tmp199_;
-#line 1957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	lower = _tmp200_;
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp201_ = _ ("Minimum");
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp202_ = g_strdup_printf ("<small>%s</small>", _tmp201_);
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	minimum_label = _tmp202_;
-#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp203_ = self->priv->quality_adjustment;
-#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp204_ = gtk_adjustment_get_upper (_tmp203_);
-#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp205_ = _tmp204_;
-#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	upper = _tmp205_;
-#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp206_ = _ ("Maximum");
-#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp207_ = g_strdup_printf ("<small>%s</small>", _tmp206_);
-#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	maximum_label = _tmp207_;
-#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp208_ = self->priv->quality_scale;
-#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp209_ = lower;
-#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp210_ = minimum_label;
-#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp208_, _tmp209_, GTK_POS_BOTTOM, _tmp210_);
-#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp211_ = self->priv->quality_scale;
-#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp211_, (gdouble) 75, GTK_POS_BOTTOM, NULL);
-#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp212_ = self->priv->quality_scale;
-#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp213_ = upper;
-#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp214_ = maximum_label;
-#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp212_, _tmp213_, GTK_POS_BOTTOM, _tmp214_);
-#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp215_ = self->priv->settings;
-#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp216_ = g_settings_get_int (_tmp215_, "jpeg-quality");
-#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_quality (self, _tmp216_);
-#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp217_ = self->priv->quality_adjustment;
-#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp217_, "value-changed", (GCallback) ___lambda20__gtk_adjustment_value_changed, self, 0);
-#line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp218_ = self->priv->settings;
-#line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp219_ = g_settings_get_string (_tmp218_, "document-type");
-#line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	document_type = _tmp219_;
-#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp220_ = document_type;
-#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp220_ != NULL) {
-#line 10083 "ui.c"
+#line 10106 "ui.c"
 		const gchar* _tmp221_ = NULL;
-#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp221_ = document_type;
-#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, _tmp221_, FALSE);
-#line 10089 "ui.c"
+#line 10112 "ui.c"
 	}
-#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp222_ = self->priv->_book;
-#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp223_ = book_view_new (_tmp222_);
-#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp223_);
-#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->book_view);
-#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->book_view = _tmp223_;
-#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp224_ = self->priv->book_view;
-#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_set_border_width ((GtkContainer*) _tmp224_, (guint) 18);
-#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp225_ = self->priv->main_vbox;
-#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp226_ = self->priv->book_view;
-#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_end (_tmp225_, (GtkWidget*) _tmp226_, TRUE, TRUE, (guint) 0);
-#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp227_ = self->priv->book_view;
-#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp227_, "page-selected", (GCallback) _user_interface_page_selected_cb_book_view_page_selected, self, 0);
-#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp228_ = self->priv->book_view;
-#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp228_, "show-page", (GCallback) _user_interface_show_page_cb_book_view_show_page, self, 0);
-#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp229_ = self->priv->book_view;
-#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp229_, "show-menu", (GCallback) _user_interface_show_page_menu_cb_book_view_show_menu, self, 0);
-#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp230_ = self->priv->book_view;
-#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp230_, TRUE);
-#line 1979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp231_ = self->priv->authorize_dialog;
-#line 1979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_transient_for ((GtkWindow*) _tmp231_, (GtkWindow*) self);
-#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp232_ = self->priv->preferences_dialog;
-#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_transient_for ((GtkWindow*) _tmp232_, (GtkWindow*) self);
-#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_load_state (self);
-#line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp233_ = self->priv->window_width;
-#line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp234_ = self->priv->window_height;
-#line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:1986: Restoring window to %dx%d pixels", _tmp233_, _tmp234_);
-#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:1995: Restoring window to %dx%d pixels", _tmp233_, _tmp234_);
+#line 1996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp235_ = self->priv->window_width;
-#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp236_ = self->priv->window_height;
-#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_default_size ((GtkWindow*) self, _tmp235_, _tmp236_);
-#line 1988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp237_ = self->priv->window_is_maximized;
-#line 1988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp237_) {
-#line 1990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_debug ("ui.vala:1990: Restoring window to maximized");
-#line 1991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_debug ("ui.vala:1999: Restoring window to maximized");
+#line 2000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_window_maximize ((GtkWindow*) self);
-#line 10157 "ui.c"
-	}
-#line 1994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp238_ = _ ("Saving document...");
-#line 1994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp239_ = progress_bar_dialog_new ((GtkApplicationWindow*) self, _tmp238_);
-#line 1994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp239_);
-#line 1994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 10180 "ui.c"
+	}
+#line 2002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp238_ = self->priv->window_is_fullscreen;
+#line 2002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp238_) {
+#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_debug ("ui.vala:2004: Restoring window to fullscreen");
+#line 2005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_window_fullscreen ((GtkWindow*) self);
+#line 10190 "ui.c"
+	}
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp239_ = _ ("Saving document...");
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp240_ = progress_bar_dialog_new ((GtkApplicationWindow*) self, _tmp239_);
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp240_);
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 1994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->progress_dialog = _tmp239_;
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp240_ = self->priv->_book;
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp240_, "saving", (GCallback) _user_interface_book_saving_cb_book_saving, self, 0);
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->progress_dialog = _tmp240_;
+#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp241_ = self->priv->_book;
+#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp241_, "saving", (GCallback) _user_interface_book_saving_cb_book_saving, self, 0);
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (document_type);
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (maximum_label);
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (minimum_label);
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (more_label);
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (less_label);
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (lighter_label);
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (darker_label);
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (content_area);
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (app);
-#line 10195 "ui.c"
+#line 10228 "ui.c"
 }
 
 
@@ -10218,89 +10251,89 @@ static gboolean user_interface_is_desktop (UserInterface* self, const gchar* nam
 	const gchar* _tmp3_ = NULL;
 	gchar** _tmp4_ = NULL;
 	gchar** _tmp5_ = NULL;
-#line 1998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (name != NULL, FALSE);
-#line 2000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_getenv ("XDG_CURRENT_DESKTOP");
-#line 2000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	desktop_name_list = _tmp1_;
-#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = desktop_name_list;
-#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_ == NULL) {
-#line 2002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 2002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (desktop_name_list);
-#line 2002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10228 "ui.c"
+#line 10261 "ui.c"
 	}
-#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = desktop_name_list;
-#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_ = g_strsplit (_tmp3_, ":", 0);
-#line 10234 "ui.c"
+#line 10267 "ui.c"
 	{
 		gchar** n_collection = NULL;
 		gint n_collection_length1 = 0;
 		gint _n_collection_size_ = 0;
 		gint n_it = 0;
-#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		n_collection = _tmp5_;
-#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		n_collection_length1 = _vala_array_length (_tmp4_);
-#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		for (n_it = 0; n_it < _vala_array_length (_tmp4_); n_it = n_it + 1) {
-#line 10246 "ui.c"
+#line 10279 "ui.c"
 			gchar* _tmp6_ = NULL;
 			gchar* n = NULL;
-#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp6_ = g_strdup (n_collection[n_it]);
-#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			n = _tmp6_;
-#line 10253 "ui.c"
+#line 10286 "ui.c"
 			{
 				const gchar* _tmp7_ = NULL;
 				const gchar* _tmp8_ = NULL;
-#line 2005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = n;
-#line 2005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = name;
-#line 2005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					result = TRUE;
-#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (n);
-#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					n_collection = (_vala_array_free (n_collection, n_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (desktop_name_list);
-#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					return result;
-#line 10273 "ui.c"
+#line 10306 "ui.c"
 				}
-#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (n);
-#line 10277 "ui.c"
+#line 10310 "ui.c"
 			}
 		}
-#line 2004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		n_collection = (_vala_array_free (n_collection, n_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 10282 "ui.c"
+#line 10315 "ui.c"
 	}
-#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (desktop_name_list);
-#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10290 "ui.c"
+#line 10323 "ui.c"
 }
 
 
@@ -10319,60 +10352,62 @@ static void user_interface_load_state (UserInterface* self) {
 	GKeyFile* _tmp17_ = NULL;
 	gboolean _tmp18_ = FALSE;
 	GKeyFile* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
+	gboolean _tmp20_ = FALSE;
 	GKeyFile* _tmp21_ = NULL;
 	gint _tmp22_ = 0;
 	GKeyFile* _tmp23_ = NULL;
 	gint _tmp24_ = 0;
 	GKeyFile* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	gchar* _tmp27_ = NULL;
-	GQuark _tmp29_ = 0U;
-#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	static GQuark _tmp28_label0 = 0;
-#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	static GQuark _tmp28_label1 = 0;
-#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	static GQuark _tmp28_label2 = 0;
-#line 10324 "ui.c"
+	gint _tmp26_ = 0;
+	GKeyFile* _tmp27_ = NULL;
+	gchar* _tmp28_ = NULL;
+	gchar* _tmp29_ = NULL;
+	GQuark _tmp31_ = 0U;
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	static GQuark _tmp30_label0 = 0;
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	static GQuark _tmp30_label1 = 0;
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	static GQuark _tmp30_label2 = 0;
+#line 10359 "ui.c"
 	GError * _inner_error_ = NULL;
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_get_state_filename (self);
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_;
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:2018: Loading state from %s", _tmp2_);
-#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:2032: Loading state from %s", _tmp2_);
+#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp2_);
-#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_key_file_new ();
-#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	f = _tmp3_;
-#line 10342 "ui.c"
+#line 10377 "ui.c"
 	{
 		GKeyFile* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = f;
-#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_state_filename (self);
-#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _tmp6_;
-#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_key_file_load_from_file (_tmp4_, _tmp7_, G_KEY_FILE_NONE, &_inner_error_);
-#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp7_);
-#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10362 "ui.c"
+#line 10397 "ui.c"
 			goto __catch23_g_error;
 		}
 	}
@@ -10381,310 +10416,316 @@ static void user_interface_load_state (UserInterface* self) {
 	{
 		GError* e = NULL;
 		GError* _tmp8_ = NULL;
-#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = e;
-#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!g_error_matches (_tmp8_, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
-#line 10379 "ui.c"
+#line 10414 "ui.c"
 			GError* _tmp9_ = NULL;
 			const gchar* _tmp10_ = NULL;
-#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = e;
-#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = _tmp9_->message;
-#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_warning ("ui.vala:2028: Failed to load state: %s", _tmp10_);
-#line 10388 "ui.c"
+#line 2042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_warning ("ui.vala:2042: Failed to load state: %s", _tmp10_);
+#line 10423 "ui.c"
 		}
-#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 10392 "ui.c"
+#line 10427 "ui.c"
 	}
 	__finally23:
-#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_key_file_unref0 (f);
-#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 10405 "ui.c"
+#line 10440 "ui.c"
 	}
-#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = f;
-#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = user_interface_state_get_integer (self, _tmp11_, "window", "width", 600);
-#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_width = _tmp12_;
-#line 2031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->window_width;
-#line 2031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp13_ <= 0) {
-#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_width = 600;
-#line 10419 "ui.c"
+#line 10454 "ui.c"
 	}
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = f;
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = user_interface_state_get_integer (self, _tmp14_, "window", "height", 400);
-#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_height = _tmp15_;
-#line 2034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = self->priv->window_height;
-#line 2034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp16_ <= 0) {
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_height = 400;
-#line 10433 "ui.c"
+#line 10468 "ui.c"
 	}
-#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = f;
-#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = user_interface_state_get_boolean (self, _tmp17_, "window", "is-maximized", FALSE);
-#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_is_maximized = _tmp18_;
-#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = f;
-#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp20_ = user_interface_state_get_integer (self, _tmp19_, "last-page", "width", 595);
-#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_width = _tmp20_;
-#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp20_ = user_interface_state_get_boolean (self, _tmp19_, "window", "is-fullscreen", FALSE);
+#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->window_is_fullscreen = _tmp20_;
+#line 2052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = f;
-#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp22_ = user_interface_state_get_integer (self, _tmp21_, "last-page", "height", 842);
-#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_height = _tmp22_;
-#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp22_ = user_interface_state_get_integer (self, _tmp21_, "last-page", "width", 595);
+#line 2052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->default_page_width = _tmp22_;
+#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = f;
-#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp24_ = user_interface_state_get_integer (self, _tmp23_, "last-page", "dpi", 72);
-#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->default_page_dpi = _tmp24_;
-#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp24_ = user_interface_state_get_integer (self, _tmp23_, "last-page", "height", 842);
+#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->default_page_height = _tmp24_;
+#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = f;
-#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp26_ = user_interface_state_get_string (self, _tmp25_, "last-page", "scan-direction", "top-to-bottom");
-#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp27_ = _tmp26_;
-#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp29_ = (NULL == _tmp27_) ? 0 : g_quark_from_string (_tmp27_);
-#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_free (_tmp27_);
-#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp29_ == ((0 != _tmp28_label0) ? _tmp28_label0 : (_tmp28_label0 = g_quark_from_static_string ("bottom-to-top")))) {
-#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp26_ = user_interface_state_get_integer (self, _tmp25_, "last-page", "dpi", 72);
+#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->default_page_dpi = _tmp26_;
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp27_ = f;
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp28_ = user_interface_state_get_string (self, _tmp27_, "last-page", "scan-direction", "top-to-bottom");
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp29_ = _tmp28_;
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp31_ = (NULL == _tmp29_) ? 0 : g_quark_from_string (_tmp29_);
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_free (_tmp29_);
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp31_ == ((0 != _tmp30_label0) ? _tmp30_label0 : (_tmp30_label0 = g_quark_from_static_string ("bottom-to-top")))) {
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 10473 "ui.c"
+#line 10514 "ui.c"
 			default:
 			{
-#line 2047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 10480 "ui.c"
+#line 10521 "ui.c"
 			}
 		}
-	} else if (_tmp29_ == ((0 != _tmp28_label1) ? _tmp28_label1 : (_tmp28_label1 = g_quark_from_static_string ("left-to-right")))) {
-#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	} else if (_tmp31_ == ((0 != _tmp30_label1) ? _tmp30_label1 : (_tmp30_label1 = g_quark_from_static_string ("left-to-right")))) {
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 10486 "ui.c"
+#line 10527 "ui.c"
 			default:
 			{
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
-#line 2051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 10493 "ui.c"
+#line 10534 "ui.c"
 			}
 		}
-	} else if (_tmp29_ == ((0 != _tmp28_label2) ? _tmp28_label2 : (_tmp28_label2 = g_quark_from_static_string ("right-to-left")))) {
-#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	} else if (_tmp31_ == ((0 != _tmp30_label2) ? _tmp30_label2 : (_tmp30_label2 = g_quark_from_static_string ("right-to-left")))) {
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 10499 "ui.c"
+#line 10540 "ui.c"
 			default:
 			{
-#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
-#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 10506 "ui.c"
+#line 10547 "ui.c"
 			}
 		}
 	} else {
-#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 10512 "ui.c"
+#line 10553 "ui.c"
 			default:
 			{
-#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 2045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 10519 "ui.c"
+#line 10560 "ui.c"
 			}
 		}
 	}
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_key_file_unref0 (f);
-#line 10525 "ui.c"
+#line 10566 "ui.c"
 }
 
 
 static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, gint _default_) {
 	gint result = 0;
 	GError * _inner_error_ = NULL;
-#line 2058 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 2058 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, 0);
-#line 2058 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, 0);
-#line 2058 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, 0);
-#line 10540 "ui.c"
+#line 10581 "ui.c"
 	{
 		gint _tmp0_ = 0;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_integer (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10559 "ui.c"
+#line 10600 "ui.c"
 			goto __catch24_g_error;
 		}
-#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp0_;
-#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10566 "ui.c"
+#line 10607 "ui.c"
 	}
 	goto __finally24;
 	__catch24_g_error:
 	{
 		gint _tmp5_ = 0;
-#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _default_;
-#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10582 "ui.c"
+#line 10623 "ui.c"
 	}
 	__finally24:
-#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return 0;
-#line 10591 "ui.c"
+#line 10632 "ui.c"
 }
 
 
 static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, gboolean _default_) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 2070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, FALSE);
-#line 2070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, FALSE);
-#line 2070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
-#line 10606 "ui.c"
+#line 10647 "ui.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_boolean (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10625 "ui.c"
+#line 10666 "ui.c"
 			goto __catch25_g_error;
 		}
-#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp0_;
-#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10632 "ui.c"
+#line 10673 "ui.c"
 	}
 	goto __finally25;
 	__catch25_g_error:
 	{
 		gboolean _tmp5_ = FALSE;
-#line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _default_;
-#line 2078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 2078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10648 "ui.c"
+#line 10689 "ui.c"
 	}
 	__finally25:
-#line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return FALSE;
-#line 10657 "ui.c"
+#line 10698 "ui.c"
 }
 
 
 static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, const gchar* _default_) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 2082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, NULL);
-#line 2082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, NULL);
-#line 2082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 2082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (_default_ != NULL, NULL);
-#line 10674 "ui.c"
+#line 10715 "ui.c"
 	{
 		gchar* _tmp0_ = NULL;
 		GKeyFile* _tmp1_ = NULL;
@@ -10692,83 +10733,83 @@ static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f,
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_string (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10694 "ui.c"
+#line 10735 "ui.c"
 			goto __catch26_g_error;
 		}
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp0_;
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = NULL;
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp0_);
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10707 "ui.c"
+#line 10748 "ui.c"
 	}
 	goto __finally26;
 	__catch26_g_error:
 	{
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _default_;
-#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = g_strdup (_tmp6_);
-#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp7_;
-#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10726 "ui.c"
+#line 10767 "ui.c"
 	}
 	__finally26:
-#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return NULL;
-#line 10735 "ui.c"
+#line 10776 "ui.c"
 }
 
 
 static gboolean ___lambda11_ (UserInterface* self) {
 	gboolean result = FALSE;
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, TRUE);
-#line 2103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_state_timeout = (guint) 0;
-#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10749 "ui.c"
+#line 10790 "ui.c"
 }
 
 
 static gboolean ____lambda11__gsource_func (gpointer self) {
 	gboolean result;
 	result = ___lambda11_ ((UserInterface*) self);
-#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10758 "ui.c"
+#line 10799 "ui.c"
 }
 
 
@@ -10786,181 +10827,189 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 	GKeyFile* _tmp12_ = NULL;
 	gboolean _tmp13_ = FALSE;
 	GKeyFile* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
+	gboolean _tmp15_ = FALSE;
 	GKeyFile* _tmp16_ = NULL;
 	gint _tmp17_ = 0;
 	GKeyFile* _tmp18_ = NULL;
 	gint _tmp19_ = 0;
-	ScanDirection _tmp20_ = 0;
+	GKeyFile* _tmp20_ = NULL;
+	gint _tmp21_ = 0;
+	ScanDirection _tmp22_ = 0;
 	GError * _inner_error_ = NULL;
-#line 2094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = force;
-#line 2096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp0_) {
-#line 10789 "ui.c"
+#line 10832 "ui.c"
 		guint _tmp1_ = 0U;
 		guint _tmp3_ = 0U;
-#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = self->priv->save_state_timeout;
-#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp1_ != ((guint) 0)) {
-#line 10796 "ui.c"
+#line 10839 "ui.c"
 			guint _tmp2_ = 0U;
-#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp2_ = self->priv->save_state_timeout;
-#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_source_remove (_tmp2_);
-#line 10802 "ui.c"
+#line 10845 "ui.c"
 		}
-#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda11__gsource_func, g_object_ref (self), g_object_unref);
-#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->save_state_timeout = _tmp3_;
-#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 10810 "ui.c"
+#line 10853 "ui.c"
 	}
-#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = user_interface_get_state_filename (self);
-#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _tmp5_;
-#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:2109: Saving state to %s", _tmp6_);
-#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:2124: Saving state to %s", _tmp6_);
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp6_);
-#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = g_key_file_new ();
-#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	f = _tmp7_;
-#line 2112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = f;
-#line 2112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->window_width;
-#line 2112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp8_, "window", "width", _tmp9_);
-#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = f;
-#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = self->priv->window_height;
-#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp10_, "window", "height", _tmp11_);
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = f;
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->window_is_maximized;
-#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_boolean (_tmp12_, "window", "is-maximized", _tmp13_);
-#line 2115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = f;
-#line 2115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp15_ = self->priv->default_page_width;
-#line 2115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_key_file_set_integer (_tmp14_, "last-page", "width", _tmp15_);
-#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp15_ = self->priv->window_is_fullscreen;
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_key_file_set_boolean (_tmp14_, "window", "is-fullscreen", _tmp15_);
+#line 2131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = f;
-#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_ = self->priv->default_page_height;
-#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_key_file_set_integer (_tmp16_, "last-page", "height", _tmp17_);
-#line 2117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp17_ = self->priv->default_page_width;
+#line 2131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_key_file_set_integer (_tmp16_, "last-page", "width", _tmp17_);
+#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = f;
-#line 2117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp19_ = self->priv->default_page_dpi;
-#line 2117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_key_file_set_integer (_tmp18_, "last-page", "dpi", _tmp19_);
-#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp20_ = self->priv->default_page_scan_direction;
-#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	switch (_tmp20_) {
-#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp19_ = self->priv->default_page_height;
+#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_key_file_set_integer (_tmp18_, "last-page", "height", _tmp19_);
+#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp20_ = f;
+#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp21_ = self->priv->default_page_dpi;
+#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_key_file_set_integer (_tmp20_, "last-page", "dpi", _tmp21_);
+#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp22_ = self->priv->default_page_scan_direction;
+#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	switch (_tmp22_) {
+#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 10868 "ui.c"
+#line 10917 "ui.c"
 		{
-			GKeyFile* _tmp21_ = NULL;
-#line 2121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp21_ = f;
-#line 2121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_key_file_set_value (_tmp21_, "last-page", "scan-direction", "top-to-bottom");
-#line 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			GKeyFile* _tmp23_ = NULL;
+#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp23_ = f;
+#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_key_file_set_value (_tmp23_, "last-page", "scan-direction", "top-to-bottom");
+#line 2138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 10877 "ui.c"
+#line 10926 "ui.c"
 		}
-#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 10881 "ui.c"
+#line 10930 "ui.c"
 		{
-			GKeyFile* _tmp22_ = NULL;
-#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp22_ = f;
-#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_key_file_set_value (_tmp22_, "last-page", "scan-direction", "bottom-to-top");
-#line 2125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			GKeyFile* _tmp24_ = NULL;
+#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp24_ = f;
+#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_key_file_set_value (_tmp24_, "last-page", "scan-direction", "bottom-to-top");
+#line 2141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 10890 "ui.c"
+#line 10939 "ui.c"
 		}
-#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 10894 "ui.c"
+#line 10943 "ui.c"
 		{
-			GKeyFile* _tmp23_ = NULL;
-#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp23_ = f;
-#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_key_file_set_value (_tmp23_, "last-page", "scan-direction", "left-to-right");
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			GKeyFile* _tmp25_ = NULL;
+#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp25_ = f;
+#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_key_file_set_value (_tmp25_, "last-page", "scan-direction", "left-to-right");
+#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 10903 "ui.c"
+#line 10952 "ui.c"
 		}
-#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 10907 "ui.c"
+#line 10956 "ui.c"
 		{
-			GKeyFile* _tmp24_ = NULL;
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp24_ = f;
-#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_key_file_set_value (_tmp24_, "last-page", "scan-direction", "right-to-left");
-#line 2131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			GKeyFile* _tmp26_ = NULL;
+#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp26_ = f;
+#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_key_file_set_value (_tmp26_, "last-page", "scan-direction", "right-to-left");
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 10916 "ui.c"
+#line 10965 "ui.c"
 		}
 		default:
-#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 10921 "ui.c"
+#line 10970 "ui.c"
 	}
 	{
-		gchar* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
 		gchar* _tmp27_ = NULL;
-		GKeyFile* _tmp28_ = NULL;
+		gchar* _tmp28_ = NULL;
 		gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp25_ = user_interface_get_state_filename (self);
-#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp26_ = _tmp25_;
-#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp27_ = _tmp26_;
-#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp28_ = f;
-#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp29_ = g_key_file_to_data (_tmp28_, NULL, NULL);
-#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp30_ = _tmp29_;
-#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_file_set_contents (_tmp27_, _tmp30_, (gssize) -1, &_inner_error_);
-#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (_tmp30_);
-#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (_tmp27_);
-#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		GKeyFile* _tmp30_ = NULL;
+		gchar* _tmp31_ = NULL;
+		gchar* _tmp32_ = NULL;
+#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp27_ = user_interface_get_state_filename (self);
+#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp28_ = _tmp27_;
+#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp29_ = _tmp28_;
+#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp30_ = f;
+#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp31_ = g_key_file_to_data (_tmp30_, NULL, NULL);
+#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp32_ = _tmp31_;
+#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_file_set_contents (_tmp29_, _tmp32_, (gssize) -1, &_inner_error_);
+#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (_tmp32_);
+#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (_tmp29_);
+#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10950 "ui.c"
+#line 10999 "ui.c"
 			goto __catch27_g_error;
 		}
 	}
@@ -10968,62 +11017,62 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 	__catch27_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp31_ = NULL;
-		const gchar* _tmp32_ = NULL;
-#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		GError* _tmp33_ = NULL;
+		const gchar* _tmp34_ = NULL;
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp31_ = e;
-#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp32_ = _tmp31_->message;
-#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:2139: Failed to write state: %s", _tmp32_);
-#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp33_ = e;
+#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp34_ = _tmp33_->message;
+#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:2155: Failed to write state: %s", _tmp34_);
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 10972 "ui.c"
+#line 11021 "ui.c"
 	}
 	__finally27:
-#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_key_file_unref0 (f);
-#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 10985 "ui.c"
+#line 11034 "ui.c"
 	}
-#line 2094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_key_file_unref0 (f);
-#line 10989 "ui.c"
+#line 11038 "ui.c"
 }
 
 
 static gboolean ___lambda21_ (UserInterface* self) {
 	gboolean result = FALSE;
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11004 "ui.c"
+#line 11053 "ui.c"
 }
 
 
 static gboolean ____lambda21__gsource_func (gpointer self) {
 	gboolean result;
 	result = ___lambda21_ ((UserInterface*) self);
-#line 2153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11013 "ui.c"
+#line 11062 "ui.c"
 }
 
 
@@ -11046,97 +11095,97 @@ static void user_interface_book_saving_cb (UserInterface* self, gint page_number
 	ProgressBarDialog* _tmp12_ = NULL;
 	gdouble _tmp13_ = 0.0;
 	ProgressBarDialog* _tmp14_ = NULL;
-#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
-#line 11040 "ui.c"
+#line 11089 "ui.c"
 		gboolean _tmp0_ = FALSE;
-#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = gtk_events_pending ();
-#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!_tmp0_) {
-#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 11048 "ui.c"
+#line 11097 "ui.c"
 		}
-#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_main_iteration ();
-#line 11052 "ui.c"
+#line 11101 "ui.c"
 	}
-#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	total = (gint) _tmp3_;
-#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_number;
-#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = total;
-#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	fraction = (_tmp4_ + 1.0) / _tmp5_;
-#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = fraction;
-#line 2151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	complete = _tmp6_ == 1.0;
-#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = complete;
-#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_) {
-#line 2153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, ____lambda21__gsource_func, g_object_ref (self), g_object_unref);
-#line 11078 "ui.c"
+#line 11127 "ui.c"
 	}
-#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("Saving page %d out of %d");
-#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = page_number;
-#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = total;
-#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = g_strdup_printf (_tmp8_, _tmp9_ + 1, _tmp10_);
-#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	message = _tmp11_;
-#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = self->priv->progress_dialog;
-#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = fraction;
-#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_set_fraction (_tmp12_, _tmp13_);
-#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = self->priv->progress_dialog;
-#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_set_message (_tmp14_, message);
-#line 2143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (message);
-#line 11102 "ui.c"
+#line 11151 "ui.c"
 }
 
 
 void user_interface_show_progress_dialog (UserInterface* self) {
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, TRUE);
-#line 11114 "ui.c"
+#line 11163 "ui.c"
 }
 
 
 void user_interface_hide_progress_dialog (UserInterface* self) {
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 11126 "ui.c"
+#line 11175 "ui.c"
 }
 
 
@@ -11146,46 +11195,46 @@ void user_interface_show_error (UserInterface* self, const gchar* error_title, c
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_title != NULL);
-#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_text != NULL);
-#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->have_error = TRUE;
-#line 2176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = error_title;
-#line 2176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_title);
-#line 2176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_title = _tmp1_;
-#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = error_text;
-#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_text);
-#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_text = _tmp3_;
-#line 2178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = change_scanner_hint;
-#line 2178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_change_scanner_hint = _tmp4_;
-#line 2179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_info_bar (self);
-#line 11166 "ui.c"
+#line 11215 "ui.c"
 }
 
 
 void user_interface_start (UserInterface* self) {
-#line 2182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) self, TRUE);
-#line 11175 "ui.c"
+#line 11224 "ui.c"
 }
 
 
@@ -11200,14 +11249,14 @@ Book* user_interface_get_book (UserInterface* self) {
 	result = _tmp0_;
 #line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11190 "ui.c"
+#line 11239 "ui.c"
 }
 
 
 static gpointer _book_ref0 (gpointer self) {
 #line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? book_ref (self) : NULL;
-#line 11197 "ui.c"
+#line 11246 "ui.c"
 }
 
 
@@ -11226,7 +11275,7 @@ static void user_interface_set_book (UserInterface* self, Book* value) {
 	self->priv->_book = _tmp1_;
 #line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "book");
-#line 11216 "ui.c"
+#line 11265 "ui.c"
 }
 
 
@@ -11247,7 +11296,7 @@ Page* user_interface_get_selected_page (UserInterface* self) {
 	result = _tmp2_;
 #line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11237 "ui.c"
+#line 11286 "ui.c"
 }
 
 
@@ -11264,7 +11313,7 @@ void user_interface_set_selected_page (UserInterface* self, Page* value) {
 	book_view_set_selected_page (_tmp0_, _tmp1_);
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "selected-page");
-#line 11254 "ui.c"
+#line 11303 "ui.c"
 }
 
 
@@ -11279,7 +11328,7 @@ gboolean user_interface_get_scanning (UserInterface* self) {
 	result = _tmp0_;
 #line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11269 "ui.c"
+#line 11318 "ui.c"
 }
 
 
@@ -11333,7 +11382,7 @@ void user_interface_set_scanning (UserInterface* self, gboolean value) {
 	gtk_widget_set_visible ((GtkWidget*) _tmp9_, _tmp10_);
 #line 194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "scanning");
-#line 11323 "ui.c"
+#line 11372 "ui.c"
 }
 
 
@@ -11342,36 +11391,36 @@ gint user_interface_get_brightness (UserInterface* self) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->brightness_adjustment;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = (gint) _tmp2_;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11344 "ui.c"
+#line 11393 "ui.c"
 }
 
 
 void user_interface_set_brightness (UserInterface* self, gint value) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->brightness_adjustment;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "brightness");
-#line 11361 "ui.c"
+#line 11410 "ui.c"
 }
 
 
@@ -11380,36 +11429,36 @@ gint user_interface_get_contrast (UserInterface* self) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->contrast_adjustment;
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = (gint) _tmp2_;
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11382 "ui.c"
+#line 11431 "ui.c"
 }
 
 
 void user_interface_set_contrast (UserInterface* self, gint value) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->contrast_adjustment;
-#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "contrast");
-#line 11399 "ui.c"
+#line 11448 "ui.c"
 }
 
 
@@ -11418,36 +11467,36 @@ gint user_interface_get_quality (UserInterface* self) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->quality_adjustment;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = (gint) _tmp2_;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11420 "ui.c"
+#line 11469 "ui.c"
 }
 
 
 void user_interface_set_quality (UserInterface* self, gint value) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->quality_adjustment;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "quality");
-#line 11437 "ui.c"
+#line 11486 "ui.c"
 }
 
 
@@ -11457,37 +11506,37 @@ gchar* user_interface_get_selected_device (UserInterface* self) {
 	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->device_combo;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 11457 "ui.c"
+#line 11506 "ui.c"
 		gchar* device = NULL;
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->device_model;
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &device, -1, -1);
 #line 239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &device, -1, -1);
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = device;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 11471 "ui.c"
+#line 11520 "ui.c"
 	}
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = NULL;
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11477 "ui.c"
+#line 11526 "ui.c"
 }
 
 
@@ -11498,31 +11547,31 @@ void user_interface_set_selected_device (UserInterface* self, const gchar* value
 	gboolean _tmp2_ = FALSE;
 	GtkComboBox* _tmp3_ = NULL;
 	GtkTreeIter _tmp4_ = {0};
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = value;
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_find_scan_device (self, _tmp0_, &_tmp1_);
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp2_) {
 #line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (!_tmp2_) {
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 11500 "ui.c"
+#line 11549 "ui.c"
 	}
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->device_combo;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = iter;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_combo_box_set_active_iter (_tmp3_, &_tmp4_);
 #line 252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_combo_box_set_active_iter (_tmp3_, &_tmp4_);
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->user_selected_device = TRUE;
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "selected-device");
-#line 11512 "ui.c"
+#line 11561 "ui.c"
 }
 
 
@@ -11530,17 +11579,17 @@ static gchar* user_interface_get_state_filename (UserInterface* self) {
 	gchar* result;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_get_user_cache_dir ();
-#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_build_filename (_tmp0_, "simple-scan", "state", NULL);
-#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp1_;
-#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11530 "ui.c"
+#line 11579 "ui.c"
 }
 
 
@@ -11559,19 +11608,19 @@ static void g_cclosure_user_marshal_VOID__STRING_SCAN_OPTIONS (GClosure * closur
 		data1 = closure->data;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 11549 "ui.c"
+#line 11598 "ui.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = closure->data;
-#line 11555 "ui.c"
+#line 11604 "ui.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback = (GMarshalFunc_VOID__STRING_SCAN_OPTIONS) (marshal_data ? marshal_data : cc->callback);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback (data1, g_value_get_string (param_values + 1), value_get_scan_options (param_values + 2), data2);
-#line 11561 "ui.c"
+#line 11610 "ui.c"
 }
 
 
@@ -11590,19 +11639,19 @@ static void g_cclosure_user_marshal_VOID__STRING_INT (GClosure * closure, GValue
 		data1 = closure->data;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 11580 "ui.c"
+#line 11629 "ui.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = closure->data;
-#line 11586 "ui.c"
+#line 11635 "ui.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback = (GMarshalFunc_VOID__STRING_INT) (marshal_data ? marshal_data : cc->callback);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback (data1, g_value_get_string (param_values + 1), g_value_get_int (param_values + 2), data2);
-#line 11592 "ui.c"
+#line 11641 "ui.c"
 }
 
 
@@ -11613,6 +11662,10 @@ static void user_interface_class_init (UserInterfaceClass * klass) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (UserInterfacePrivate));
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	((GtkWidgetClass *) klass)->size_allocate = user_interface_real_size_allocate;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	((GtkWidgetClass *) klass)->window_state_event = user_interface_real_window_state_event;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_user_interface_get_property;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_user_interface_set_property;
@@ -11821,12 +11874,8 @@ static void user_interface_class_init (UserInterfaceClass * klass) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "quit_menuitem_activate_cb", G_CALLBACK(_user_interface_quit_menuitem_activate_cb_gtk_menu_item_activate));
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "simple_scan_window_configure_event_cb", G_CALLBACK(_user_interface_simple_scan_window_configure_event_cb_gtk_widget_configure_event));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "simple_scan_window_window_state_event_cb", G_CALLBACK(_user_interface_simple_scan_window_window_state_event_cb_gtk_widget_window_state_event));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "window_delete_event_cb", G_CALLBACK(_user_interface_window_delete_event_cb_gtk_widget_delete_event));
-#line 11816 "ui.c"
+#line 11865 "ui.c"
 }
 
 
@@ -11846,7 +11895,7 @@ static void user_interface_instance_init (UserInterface * self) {
 	self->priv->scanning_ = FALSE;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_init_template (GTK_WIDGET (self));
-#line 11836 "ui.c"
+#line 11885 "ui.c"
 }
 
 
@@ -11860,23 +11909,23 @@ static void user_interface_finalize (GObject* obj) {
 	guint _tmp5_ = 0U;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_USER_INTERFACE, UserInterface);
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp1_, NULL, FALSE);
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _user_interface_page_added_cb_book_page_added, self);
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _user_interface_page_added_cb_book_page_added, self);
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->_book;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("reordered", TYPE_BOOK, &_tmp3_, NULL, FALSE);
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _user_interface_reordered_cb_book_reordered, self);
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _user_interface_reordered_cb_book_reordered, self);
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->_book;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp5_, NULL, FALSE);
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _user_interface_page_removed_cb_book_page_removed, self);
 #line 33 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->settings);
@@ -12022,7 +12071,7 @@ static void user_interface_finalize (GObject* obj) {
 	_g_free0 (self->priv->document_hint);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (user_interface_parent_class)->finalize (obj);
-#line 12012 "ui.c"
+#line 12061 "ui.c"
 }
 
 
@@ -12085,13 +12134,13 @@ static void _vala_user_interface_get_property (GObject * object, guint property_
 		g_value_take_string (value, user_interface_get_selected_device (self));
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12075 "ui.c"
+#line 12124 "ui.c"
 		default:
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12081 "ui.c"
+#line 12130 "ui.c"
 	}
 }
 
@@ -12143,13 +12192,13 @@ static void _vala_user_interface_set_property (GObject * object, guint property_
 		user_interface_set_selected_device (self, g_value_get_string (value));
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12133 "ui.c"
+#line 12182 "ui.c"
 		default:
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12139 "ui.c"
+#line 12188 "ui.c"
 	}
 }
 
@@ -12168,92 +12217,92 @@ ProgressBarDialog* progress_bar_dialog_construct (GType object_type, GtkApplicat
 	const gchar* _tmp7_ = NULL;
 	GtkApplicationWindow* _tmp8_ = NULL;
 	GtkProgressBar* _tmp9_ = NULL;
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (parent != NULL, NULL);
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (ProgressBarDialog*) g_object_new (object_type, NULL);
-#line 2206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 2206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 2206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
-#line 2206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->bar = _tmp0_;
-#line 2207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-#line 2207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp1_);
-#line 2207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	hbox = _tmp1_;
-#line 2208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-#line 2208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp2_);
-#line 2208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	vbox = _tmp2_;
-#line 2209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_hexpand ((GtkWidget*) hbox, TRUE);
-#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->bar;
-#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp3_, "");
-#line 2212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->bar;
-#line 2212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_show_text (_tmp4_, TRUE);
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->bar;
-#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) _tmp5_, 225, 25);
-#line 2214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) self, 250, 50);
-#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->bar;
-#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) _tmp6_, TRUE, FALSE, (guint) 0);
-#line 2217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (hbox, (GtkWidget*) vbox, TRUE, FALSE, (guint) 0);
-#line 2218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) self, (GtkWidget*) hbox);
-#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = title;
-#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_title ((GtkWindow*) self, _tmp7_);
-#line 2221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = parent;
-#line 2221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_transient_for ((GtkWindow*) self, (GtkWindow*) _tmp8_);
-#line 2222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_position ((GtkWindow*) self, GTK_WIN_POS_CENTER_ON_PARENT);
-#line 2223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_modal ((GtkWindow*) self, TRUE);
-#line 2224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_resizable ((GtkWindow*) self, FALSE);
-#line 2226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) hbox, TRUE);
-#line 2227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) vbox, TRUE);
-#line 2228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->bar;
-#line 2228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp9_, TRUE);
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (vbox);
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 12236 "ui.c"
+#line 12285 "ui.c"
 }
 
 
 ProgressBarDialog* progress_bar_dialog_new (GtkApplicationWindow* parent, const gchar* title) {
-#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return progress_bar_dialog_construct (TYPE_PROGRESS_BAR_DIALOG, parent, title);
-#line 12243 "ui.c"
+#line 12292 "ui.c"
 }
 
 
@@ -12262,36 +12311,36 @@ gdouble progress_bar_dialog_get_fraction (ProgressBarDialog* self) {
 	GtkProgressBar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0.0);
-#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_progress_bar_get_fraction (_tmp0_);
-#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp2_;
-#line 2194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 12264 "ui.c"
+#line 12313 "ui.c"
 }
 
 
 void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble value) {
 	GtkProgressBar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_fraction (_tmp0_, _tmp1_);
-#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "fraction");
-#line 12281 "ui.c"
+#line 12330 "ui.c"
 }
 
 
@@ -12300,74 +12349,74 @@ const gchar* progress_bar_dialog_get_message (ProgressBarDialog* self) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_progress_bar_get_text (_tmp0_);
-#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp2_;
-#line 2200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 12302 "ui.c"
+#line 12351 "ui.c"
 }
 
 
 void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* value) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "message");
-#line 12319 "ui.c"
+#line 12368 "ui.c"
 }
 
 
 static void progress_bar_dialog_class_init (ProgressBarDialogClass * klass) {
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (ProgressBarDialogPrivate));
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_progress_bar_dialog_get_property;
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_progress_bar_dialog_set_property;
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->finalize = progress_bar_dialog_finalize;
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), PROGRESS_BAR_DIALOG_FRACTION, g_param_spec_double ("fraction", "fraction", "fraction", -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), PROGRESS_BAR_DIALOG_MESSAGE, g_param_spec_string ("message", "message", "message", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 12338 "ui.c"
+#line 12387 "ui.c"
 }
 
 
 static void progress_bar_dialog_instance_init (ProgressBarDialog * self) {
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = PROGRESS_BAR_DIALOG_GET_PRIVATE (self);
-#line 12345 "ui.c"
+#line 12394 "ui.c"
 }
 
 
 static void progress_bar_dialog_finalize (GObject* obj) {
 	ProgressBarDialog * self;
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
-#line 2190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (progress_bar_dialog_parent_class)->finalize (obj);
-#line 12357 "ui.c"
+#line 12406 "ui.c"
 }
 
 
@@ -12386,27 +12435,27 @@ GType progress_bar_dialog_get_type (void) {
 static void _vala_progress_bar_dialog_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
 	ProgressBarDialog * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (property_id) {
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_FRACTION:
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_double (value, progress_bar_dialog_get_fraction (self));
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_MESSAGE:
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_string (value, progress_bar_dialog_get_message (self));
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12390 "ui.c"
+#line 12439 "ui.c"
 		default:
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12396 "ui.c"
+#line 12445 "ui.c"
 	}
 }
 
@@ -12414,27 +12463,27 @@ static void _vala_progress_bar_dialog_get_property (GObject * object, guint prop
 static void _vala_progress_bar_dialog_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
 	ProgressBarDialog * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (property_id) {
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_FRACTION:
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		progress_bar_dialog_set_fraction (self, g_value_get_double (value));
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_MESSAGE:
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		progress_bar_dialog_set_message (self, g_value_get_string (value));
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12418 "ui.c"
+#line 12467 "ui.c"
 		default:
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 2188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 12424 "ui.c"
+#line 12473 "ui.c"
 	}
 }
 
@@ -12447,45 +12496,45 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
 	gchar* _tmp2_ = NULL;
 	gchar* path = NULL;
 	GError * _inner_error_ = NULL;
-#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (prefix != NULL, NULL);
-#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (extension != NULL, NULL);
-#line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = prefix;
-#line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = extension;
-#line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_);
-#line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp2_;
-#line 12449 "ui.c"
+#line 12498 "ui.c"
 	{
 		gint fd = 0;
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = filename;
-#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_file_open_tmp (_tmp3_, &_tmp4_, &_inner_error_);
-#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		path = _tmp4_;
-#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		fd = _tmp5_;
-#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12468 "ui.c"
+#line 12517 "ui.c"
 			goto __catch28_g_error;
 		}
-#line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = fd;
-#line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		close (_tmp6_);
-#line 12475 "ui.c"
+#line 12524 "ui.c"
 	}
 	goto __finally28;
 	__catch28_g_error:
@@ -12493,50 +12542,50 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
 		GError* e = NULL;
 		GError* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
-#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = e;
-#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_->message;
-#line 2247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:2247: Error saving email attachment: %s", _tmp8_);
-#line 2248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:2263: Error saving email attachment: %s", _tmp8_);
+#line 2264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = NULL;
-#line 2248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 2248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 2248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 12503 "ui.c"
+#line 12552 "ui.c"
 	}
 	__finally28:
-#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return NULL;
-#line 12518 "ui.c"
+#line 12567 "ui.c"
 	}
-#line 2251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = path;
-#line 2251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 2251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 12526 "ui.c"
+#line 12575 "ui.c"
 }
 
 
@@ -12547,40 +12596,40 @@ PageIcon* page_icon_construct (GType object_type, const gchar* text, gdouble r,
 	gdouble _tmp2_ = 0.0;
 	gdouble _tmp3_ = 0.0;
 	gdouble _tmp4_ = 0.0;
-#line 2262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (text != NULL, NULL);
-#line 2262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) g_object_new (object_type, NULL);
-#line 2264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = text;
-#line 2264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->text);
-#line 2264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->text = _tmp1_;
-#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = r;
-#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->r = _tmp2_;
-#line 2266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g;
-#line 2266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->g = _tmp3_;
-#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = b;
-#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->b = _tmp4_;
-#line 2262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 12563 "ui.c"
+#line 12612 "ui.c"
 }
 
 
 PageIcon* page_icon_new (const gchar* text, gdouble r, gdouble g, gdouble b) {
-#line 2262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return page_icon_construct (TYPE_PAGE_ICON, text, r, g, b);
-#line 12570 "ui.c"
+#line 12619 "ui.c"
 }
 
 
@@ -12588,23 +12637,23 @@ static void page_icon_real_get_preferred_width (GtkWidget* base, gint* minimum_w
 	PageIcon * self;
 	gint _vala_minimum_width = 0;
 	gint _vala_natural_width = 0;
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_width = PAGE_ICON_MINIMUM_WIDTH;
-#line 2272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_width = _vala_natural_width;
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_width) {
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_width = _vala_minimum_width;
-#line 12588 "ui.c"
+#line 12637 "ui.c"
 	}
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_width) {
-#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_width = _vala_natural_width;
-#line 12594 "ui.c"
+#line 12643 "ui.c"
 	}
 }
 
@@ -12614,25 +12663,25 @@ static void page_icon_real_get_preferred_height (GtkWidget* base, gint* minimum_
 	gint _vala_minimum_height = 0;
 	gint _vala_natural_height = 0;
 	gdouble _tmp0_ = 0.0;
-#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = round (PAGE_ICON_MINIMUM_WIDTH * G_SQRT2);
-#line 2277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_height = (gint) _tmp0_;
-#line 2277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_height = _vala_natural_height;
-#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_height) {
-#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_height = _vala_minimum_height;
-#line 12616 "ui.c"
+#line 12665 "ui.c"
 	}
-#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_height) {
-#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_height = _vala_natural_height;
-#line 12622 "ui.c"
+#line 12671 "ui.c"
 	}
 }
 
@@ -12642,25 +12691,25 @@ static void page_icon_real_get_preferred_height_for_width (GtkWidget* base, gint
 	gint _vala_minimum_height = 0;
 	gint _vala_natural_height = 0;
 	gint _tmp0_ = 0;
-#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = width;
-#line 2282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_height = (gint) (_tmp0_ * G_SQRT2);
-#line 2282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_height = _vala_natural_height;
-#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_height) {
-#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_height = _vala_minimum_height;
-#line 12644 "ui.c"
+#line 12693 "ui.c"
 	}
-#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_height) {
-#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_height = _vala_natural_height;
-#line 12650 "ui.c"
+#line 12699 "ui.c"
 	}
 }
 
@@ -12670,25 +12719,25 @@ static void page_icon_real_get_preferred_width_for_height (GtkWidget* base, gint
 	gint _vala_minimum_width = 0;
 	gint _vala_natural_width = 0;
 	gint _tmp0_ = 0;
-#line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = height;
-#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_width = (gint) (_tmp0_ / G_SQRT2);
-#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_width = _vala_natural_width;
-#line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_width) {
-#line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_width = _vala_minimum_width;
-#line 12672 "ui.c"
+#line 12721 "ui.c"
 	}
-#line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_width) {
-#line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_width = _vala_natural_width;
-#line 12678 "ui.c"
+#line 12727 "ui.c"
 	}
 }
 
@@ -12731,166 +12780,166 @@ static gboolean page_icon_real_draw (GtkWidget* base, cairo_t* c) {
 	gdouble _tmp33_ = 0.0;
 	cairo_t* _tmp34_ = NULL;
 	const gchar* _tmp35_ = NULL;
-#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (c != NULL, FALSE);
-#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_widget_get_allocated_width ((GtkWidget*) self);
-#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	w = _tmp0_;
-#line 2293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_widget_get_allocated_height ((GtkWidget*) self);
-#line 2293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	h = _tmp1_;
-#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = w;
-#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = h;
-#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((_tmp2_ * G_SQRT2) > ((gdouble) _tmp3_)) {
-#line 12739 "ui.c"
+#line 12788 "ui.c"
 		gint _tmp4_ = 0;
 		gdouble _tmp5_ = 0.0;
-#line 2295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = h;
-#line 2295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = round (_tmp4_ / G_SQRT2);
-#line 2295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		w = (gint) _tmp5_;
-#line 12748 "ui.c"
+#line 12797 "ui.c"
 	} else {
 		gint _tmp6_ = 0;
 		gdouble _tmp7_ = 0.0;
-#line 2297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = w;
-#line 2297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = round (_tmp6_ * G_SQRT2);
-#line 2297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		h = (gint) _tmp7_;
-#line 12758 "ui.c"
+#line 12807 "ui.c"
 	}
-#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = c;
-#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = gtk_widget_get_allocated_width ((GtkWidget*) self);
-#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = w;
-#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = gtk_widget_get_allocated_height ((GtkWidget*) self);
-#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = h;
-#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_translate (_tmp8_, (gdouble) ((_tmp9_ - _tmp10_) / 2), (gdouble) ((_tmp11_ - _tmp12_) / 2));
-#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = c;
-#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = w;
-#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = h;
-#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_rectangle (_tmp13_, 0.5, 0.5, (gdouble) (_tmp14_ - 1), (gdouble) (_tmp15_ - 1));
-#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = c;
-#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->r;
-#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = self->priv->g;
-#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = self->priv->b;
-#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_source_rgb (_tmp16_, _tmp17_, _tmp18_, _tmp19_);
-#line 2304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = c;
-#line 2304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_fill_preserve (_tmp20_);
-#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = c;
-#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_line_width (_tmp21_, 1.0);
-#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = c;
-#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_source_rgb (_tmp22_, 0.0, 0.0, 0.0);
-#line 2308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = c;
-#line 2308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_stroke (_tmp23_);
-#line 2311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = c;
-#line 2311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = self->priv->text;
-#line 2311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_text_extents (_tmp24_, _tmp25_, &_tmp26_);
-#line 2311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extents = _tmp26_;
-#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = c;
-#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = w;
-#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = extents;
-#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = _tmp29_.width;
-#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = h;
-#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = extents;
-#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = _tmp32_.height;
-#line 2312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_translate (_tmp27_, ((_tmp28_ - _tmp30_) * 0.5) - 0.5, ((_tmp31_ + _tmp33_) * 0.5) - 0.5);
-#line 2313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp34_ = c;
-#line 2313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = self->priv->text;
-#line 2313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_show_text (_tmp34_, _tmp35_);
-#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 2315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 12840 "ui.c"
+#line 12889 "ui.c"
 }
 
 
 static void page_icon_class_init (PageIconClass * klass) {
-#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_icon_parent_class = g_type_class_peek_parent (klass);
-#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (PageIconPrivate));
-#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->get_preferred_width = page_icon_real_get_preferred_width;
-#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->get_preferred_height = page_icon_real_get_preferred_height;
-#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->get_preferred_height_for_width = page_icon_real_get_preferred_height_for_width;
-#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->get_preferred_width_for_height = page_icon_real_get_preferred_width_for_height;
-#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->draw = page_icon_real_draw;
-#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_icon_finalize;
-#line 12861 "ui.c"
+#line 12910 "ui.c"
 }
 
 
 static void page_icon_instance_init (PageIcon * self) {
-#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = PAGE_ICON_GET_PRIVATE (self);
-#line 12868 "ui.c"
+#line 12917 "ui.c"
 }
 
 
 static void page_icon_finalize (GObject* obj) {
 	PageIcon * self;
-#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_ICON, PageIcon);
-#line 2256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->text);
-#line 2254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (page_icon_parent_class)->finalize (obj);
-#line 12880 "ui.c"
+#line 12929 "ui.c"
 }
 
 
diff --git a/src/ui.vala b/src/ui.vala
index c16ab60..2dd1d57 100644
--- a/src/ui.vala
+++ b/src/ui.vala
@@ -205,6 +205,7 @@ public class UserInterface : Gtk.ApplicationWindow
     private int window_width;
     private int window_height;
     private bool window_is_maximized;
+    private bool window_is_fullscreen;    
 
     private uint save_state_timeout;
 
@@ -1531,17 +1532,15 @@ public class UserInterface : Gtk.ApplicationWindow
         on_quit ();
     }
 
-    [GtkCallback]
-    private bool simple_scan_window_configure_event_cb (Gtk.Widget widget, Gdk.EventConfigure event)
+    public override void size_allocate (Gtk.Allocation allocation)
     {
-        if (!window_is_maximized)
+        base.size_allocate (allocation);
+
+        if (!window_is_maximized && !window_is_fullscreen)
         {
-            window_width = event.width;
-            window_height = event.height;
+            get_size (out window_width, out window_height);
             save_state ();
         }
-
-        return false;
     }
 
     private void info_bar_response_cb (Gtk.InfoBar widget, int response_id)
@@ -1701,15 +1700,25 @@ public class UserInterface : Gtk.ApplicationWindow
     }
 #endif
 
-    [GtkCallback]
-    private bool simple_scan_window_window_state_event_cb (Gtk.Widget widget, Gdk.EventWindowState event)
+    public override bool window_state_event (Gdk.EventWindowState event)
     {
+        var result = Gdk.EVENT_PROPAGATE;
+
+        if (base.window_state_event != null)
+            result = base.window_state_event (event);
+
         if ((event.changed_mask & Gdk.WindowState.MAXIMIZED) != 0)
         {
             window_is_maximized = (event.new_window_state & Gdk.WindowState.MAXIMIZED) != 0;
             save_state ();
         }
-        return false;
+        if ((event.changed_mask & Gdk.WindowState.FULLSCREEN) != 0)
+        {
+            window_is_fullscreen = (event.new_window_state & Gdk.WindowState.FULLSCREEN) != 0;
+            save_state ();
+        }
+
+        return result;
     }
 
     [GtkCallback]
@@ -1990,6 +1999,11 @@ public class UserInterface : Gtk.ApplicationWindow
             debug ("Restoring window to maximized");
             maximize ();
         }
+        if (window_is_fullscreen)
+        {
+            debug ("Restoring window to fullscreen");
+            fullscreen ();
+        }
 
         progress_dialog = new ProgressBarDialog (this, _("Saving document..."));
         book.saving.connect (book_saving_cb);
@@ -2034,6 +2048,7 @@ public class UserInterface : Gtk.ApplicationWindow
         if (window_height <= 0)
             window_height = 400;
         window_is_maximized = state_get_boolean (f, "window", "is-maximized");
+        window_is_fullscreen = state_get_boolean (f, "window", "is-fullscreen");
         default_page_width = state_get_integer (f, "last-page", "width", 595);
         default_page_height = state_get_integer (f, "last-page", "height", 842);
         default_page_dpi = state_get_integer (f, "last-page", "dpi", 72);
@@ -2112,6 +2127,7 @@ public class UserInterface : Gtk.ApplicationWindow
         f.set_integer ("window", "width", window_width);
         f.set_integer ("window", "height", window_height);
         f.set_boolean ("window", "is-maximized", window_is_maximized);
+        f.set_boolean ("window", "is-fullscreen", window_is_fullscreen);        
         f.set_integer ("last-page", "width", default_page_width);
         f.set_integer ("last-page", "height", default_page_height);
         f.set_integer ("last-page", "dpi", default_page_dpi);
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2016-03-27 10:25:50 +0200
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2016-03-27 10:25:50 +0200
commit	3d4577b0ff453500f7ee52e539a6c2f6fc3faac7 (patch)
tree	c3311dea5430a6872213146b4c710542cca681da
parent	59c8c1046c1b17411232821ff892febf42cb82e6 (diff)