Merge tag 'upstream/3.17.90'

Upstream version 3.17.90

10 files changed, 9653 insertions, 6643 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index d317e66..8bfb480 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,6 +8,8 @@ simple_scan_SOURCES = \
 	book.vala \
 	book-view.vala \
 	colord.vapi \
+	fixes.vapi \
+	packagekit-glib2.vapi \
 	page.vala \
 	page-view.vala \
 	sane.vapi \
@@ -18,8 +20,9 @@ simple_scan_SOURCES = \
 	resources.c
 
 simple_scan_VALAFLAGS = \
+	--pkg=posix \
 	--pkg=zlib \
-	--pkg=gudev-1.0 \
+	--pkg=gusb \
 	--pkg=gio-2.0 \
 	--pkg=gtk+-3.0 \
 	--gresources=$(top_srcdir)/data/simple-scan.gresource.xml \
@@ -41,7 +44,8 @@ simple_scan_CFLAGS = \
 	-DUI_DIR=\"$(datadir)/simple-scan/\" \
 	-DICON_DIR=\"$(datadir)/simple-scan/icons\" \
 	-DGCONF_DIR=\"/apps/simple-scan\" \
-	-DSIMPLE_SCAN_BINARY=\"simple-scan\"
+	-DSIMPLE_SCAN_BINARY=\"simple-scan\" \
+	-DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
 
 simple_scan_LDADD = \
 	$(SIMPLE_SCAN_LIBS) \
@@ -53,6 +57,3 @@ CLEANFILES = \
 	$(patsubst %.vala,%.c,$(filter %.vala, $(SOURCES))) \
 	resources.c \
 	*_vala.stamp
-
-DISTCLEANFILES = \
-	Makefile.in
diff --git a/src/Makefile.in b/src/Makefile.in
index c47e058..f8e3ab5 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -310,6 +310,8 @@ simple_scan_SOURCES = \
 	book.vala \
 	book-view.vala \
 	colord.vapi \
+	fixes.vapi \
+	packagekit-glib2.vapi \
 	page.vala \
 	page-view.vala \
 	sane.vapi \
@@ -319,8 +321,8 @@ simple_scan_SOURCES = \
 	autosave-manager.vala \
 	resources.c
 
-simple_scan_VALAFLAGS = --pkg=zlib --pkg=gudev-1.0 --pkg=gio-2.0 \
-	--pkg=gtk+-3.0 \
+simple_scan_VALAFLAGS = --pkg=posix --pkg=zlib --pkg=gusb \
+	--pkg=gio-2.0 --pkg=gtk+-3.0 \
 	--gresources=$(top_srcdir)/data/simple-scan.gresource.xml \
 	--debug --target-glib 2.38 $(am__append_1)
 simple_scan_CFLAGS = \
@@ -334,7 +336,8 @@ simple_scan_CFLAGS = \
 	-DUI_DIR=\"$(datadir)/simple-scan/\" \
 	-DICON_DIR=\"$(datadir)/simple-scan/icons\" \
 	-DGCONF_DIR=\"/apps/simple-scan\" \
-	-DSIMPLE_SCAN_BINARY=\"simple-scan\"
+	-DSIMPLE_SCAN_BINARY=\"simple-scan\" \
+	-DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
 
 simple_scan_LDADD = \
 	$(SIMPLE_SCAN_LIBS) \
@@ -347,9 +350,6 @@ CLEANFILES = \
 	resources.c \
 	*_vala.stamp
 
-DISTCLEANFILES = \
-	Makefile.in
-
 all: all-am
 
 .SUFFIXES:
@@ -625,9 +625,9 @@ $(srcdir)/autosave-manager.c: $(srcdir)/simple_scan_vala.stamp
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/simple_scan_vala.stamp; \
 	fi
-$(srcdir)/simple_scan_vala.stamp: config.vapi book.vala book-view.vala colord.vapi page.vala page-view.vala sane.vapi simple-scan.vala scanner.vala ui.vala autosave-manager.vala
+$(srcdir)/simple_scan_vala.stamp: config.vapi book.vala book-view.vala colord.vapi fixes.vapi packagekit-glib2.vapi page.vala page-view.vala sane.vapi simple-scan.vala scanner.vala ui.vala autosave-manager.vala
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(simple_scan_VALAFLAGS) $(VALAFLAGS) -C config.vapi book.vala book-view.vala colord.vapi page.vala page-view.vala sane.vapi simple-scan.vala scanner.vala ui.vala autosave-manager.vala
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(simple_scan_VALAFLAGS) $(VALAFLAGS) -C config.vapi book.vala book-view.vala colord.vapi fixes.vapi packagekit-glib2.vapi page.vala page-view.vala sane.vapi simple-scan.vala scanner.vala ui.vala autosave-manager.vala
 	$(AM_V_at)mv -f $@-t $@
 
 ID: $(am__tagged_files)
@@ -746,7 +746,6 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/src/autosave-manager.c b/src/autosave-manager.c
index e4b37a9..58a0392 100644
--- a/src/autosave-manager.c
+++ b/src/autosave-manager.c
@@ -277,11 +277,11 @@ void autosave_manager_load (AutosaveManager* self) {
 #line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 280 "autosave-manager.c"
-			goto __catch27_g_error;
+			goto __catch29_g_error;
 		}
 	}
-	goto __finally27;
-	__catch27_g_error:
+	goto __finally29;
+	__catch29_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp6_ = NULL;
@@ -313,7 +313,7 @@ void autosave_manager_load (AutosaveManager* self) {
 		return;
 #line 314 "autosave-manager.c"
 	}
-	__finally27:
+	__finally29:
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -721,11 +721,11 @@ void autosave_manager_load (AutosaveManager* self) {
 #line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 723 "autosave-manager.c"
-							goto __catch28_g_error;
+							goto __catch30_g_error;
 						}
 					}
-					goto __finally28;
-					__catch28_g_error:
+					goto __finally30;
+					__catch30_g_error:
 					{
 						GError* e = NULL;
 #line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -756,7 +756,7 @@ void autosave_manager_load (AutosaveManager* self) {
 						continue;
 #line 757 "autosave-manager.c"
 					}
-					__finally28:
+					__finally30:
 #line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -914,7 +914,7 @@ static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file,
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 916 "autosave-manager.c"
-			goto __catch29_g_error;
+			goto __catch31_g_error;
 		}
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp5_ = _tmp0_;
@@ -928,8 +928,8 @@ static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file,
 		return result;
 #line 929 "autosave-manager.c"
 	}
-	goto __finally29;
-	__catch29_g_error:
+	goto __finally31;
+	__catch31_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -950,7 +950,7 @@ static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file,
 		return result;
 #line 951 "autosave-manager.c"
 	}
-	__finally29:
+	__finally31:
 #line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.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 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -992,7 +992,7 @@ static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file,
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 994 "autosave-manager.c"
-			goto __catch30_g_error;
+			goto __catch32_g_error;
 		}
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		result = _tmp0_;
@@ -1000,8 +1000,8 @@ static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file,
 		return result;
 #line 1001 "autosave-manager.c"
 	}
-	goto __finally30;
-	__catch30_g_error:
+	goto __finally32;
+	__catch32_g_error:
 	{
 		GError* e = NULL;
 		gint _tmp5_ = 0;
@@ -1019,7 +1019,7 @@ static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file,
 		return result;
 #line 1020 "autosave-manager.c"
 	}
-	__finally30:
+	__finally32:
 #line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.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 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -1061,7 +1061,7 @@ static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* f
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1063 "autosave-manager.c"
-			goto __catch31_g_error;
+			goto __catch33_g_error;
 		}
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		result = _tmp0_;
@@ -1069,8 +1069,8 @@ static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* f
 		return result;
 #line 1070 "autosave-manager.c"
 	}
-	goto __finally31;
-	__catch31_g_error:
+	goto __finally33;
+	__catch33_g_error:
 	{
 		GError* e = NULL;
 		gboolean _tmp5_ = FALSE;
@@ -1088,7 +1088,7 @@ static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* f
 		return result;
 #line 1089 "autosave-manager.c"
 	}
-	__finally31:
+	__finally33:
 #line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.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 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -1136,7 +1136,7 @@ void autosave_manager_cleanup (AutosaveManager* self) {
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1138 "autosave-manager.c"
-			goto __catch32_g_error;
+			goto __catch34_g_error;
 		}
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp5_ = _tmp2_;
@@ -1150,8 +1150,8 @@ void autosave_manager_cleanup (AutosaveManager* self) {
 		_g_dir_close0 (_tmp2_);
 #line 1151 "autosave-manager.c"
 	}
-	goto __finally32;
-	__catch32_g_error:
+	goto __finally34;
+	__catch34_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp6_ = NULL;
@@ -1174,7 +1174,7 @@ void autosave_manager_cleanup (AutosaveManager* self) {
 		return;
 #line 1175 "autosave-manager.c"
 	}
-	__finally32:
+	__finally34:
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -1990,11 +1990,11 @@ static void autosave_manager_real_save (AutosaveManager* self) {
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1992 "autosave-manager.c"
-			goto __catch33_g_error;
+			goto __catch35_g_error;
 		}
 	}
-	goto __finally33;
-	__catch33_g_error:
+	goto __finally35;
+	__catch35_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp116_ = NULL;
@@ -2013,7 +2013,7 @@ static void autosave_manager_real_save (AutosaveManager* self) {
 		_g_error_free0 (e);
 #line 2014 "autosave-manager.c"
 	}
-	__finally33:
+	__finally35:
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -2102,11 +2102,11 @@ static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) {
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2104 "autosave-manager.c"
-			goto __catch34_g_error;
+			goto __catch36_g_error;
 		}
 	}
-	goto __finally34;
-	__catch34_g_error:
+	goto __finally36;
+	__catch36_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp14_ = NULL;
@@ -2125,7 +2125,7 @@ static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) {
 		_g_error_free0 (e);
 #line 2126 "autosave-manager.c"
 	}
-	__finally34:
+	__finally36:
 #line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
diff --git a/src/fixes.vapi b/src/fixes.vapi
new file mode 100644
index 0000000..b83c36c
--- /dev/null
+++ b/src/fixes.vapi
@@ -0,0 +1,4 @@
+namespace GUsb {
+	/* Fixed in 0.2.7: https://github.com/hughsie/libgusb/commit/83a6b1a20653c1a17f0a909f08652b5e1df44075 */
+	public GLib.GenericArray<GUsb.Device> context_get_devices (GUsb.Context context);
+}
diff --git a/src/packagekit-glib2.vapi b/src/packagekit-glib2.vapi
new file mode 100644
index 0000000..66c3907
--- /dev/null
+++ b/src/packagekit-glib2.vapi
@@ -0,0 +1,1371 @@
+/* packagekit-glib2.vapi generated by vapigen-0.28, do not modify. */
+
+[CCode (cprefix = "Pk", gir_namespace = "PackageKitGlib", gir_version = "1.0", lower_case_cprefix = "pk_")]
+namespace Pk {
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_category_get_type ()")]
+	public class Category : Pk.Source {
+		[CCode (has_construct_function = false)]
+		public Category ();
+		public unowned string get_icon ();
+		public unowned string get_id ();
+		public unowned string get_name ();
+		public unowned string get_parent_id ();
+		public unowned string get_summary ();
+		public void set_icon (string icon);
+		public void set_id (string cat_id);
+		public void set_name (string name);
+		public void set_parent_id (string parent_id);
+		public void set_summary (string summary);
+		[NoAccessorMethod]
+		public string cat_id { owned get; set; }
+		public string icon { get; set; }
+		public string name { get; set; }
+		public string parent_id { get; set; }
+		public string summary { get; set; }
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_client_get_type ()")]
+	public class Client : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Client ();
+		public Pk.Results accept_eula (string eula_id, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results accept_eula_async (string eula_id, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results adopt (string transaction_id, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results adopt_async (string transaction_id, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[NoWrapper]
+		public virtual void changed ();
+		public Pk.Results depends_on (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool recursive, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results depends_on_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool recursive, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results download_packages ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, string directory, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results download_packages_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, string directory, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public bool get_background ();
+		public uint get_cache_age ();
+		public Pk.Results get_categories (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results get_categories_async (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results get_details ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results get_details_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results get_details_local ([CCode (array_length = false, array_null_terminated = true)] string[] files, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results get_details_local_async ([CCode (array_length = false, array_null_terminated = true)] string[] files, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results get_distro_upgrades (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results get_distro_upgrades_async (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results get_files ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results get_files_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results get_files_local ([CCode (array_length = false, array_null_terminated = true)] string[] files, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results get_files_local_async ([CCode (array_length = false, array_null_terminated = true)] string[] files, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public bool get_idle ();
+		public bool get_interactive ();
+		public unowned string get_locale ();
+		public Pk.Results get_old_transactions (uint number, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results get_old_transactions_async (uint number, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results get_packages (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results get_packages_async (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Progress get_progress (string transaction_id, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async Pk.Progress get_progress_async (string transaction_id, GLib.Cancellable? cancellable) throws GLib.Error;
+		public Pk.Results get_repo_list (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results get_repo_list_async (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results get_update_detail ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results get_update_detail_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results get_updates (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results get_updates_async (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results install_files (Pk.Bitfield transaction_flags, [CCode (array_length = false, array_null_terminated = true)] string[] files, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results install_files_async (Pk.Bitfield transaction_flags, [CCode (array_length = false, array_null_terminated = true)] string[] files, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results install_packages (Pk.Bitfield transaction_flags, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results install_packages_async (Pk.Bitfield transaction_flags, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results install_signature (Pk.SigType type, string key_id, string package_id, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results install_signature_async (Pk.SigType type, string key_id, string package_id, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results refresh_cache (bool force, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results refresh_cache_async (bool force, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results remove_packages (Pk.Bitfield transaction_flags, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool allow_deps, bool autoremove, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results remove_packages_async (Pk.Bitfield transaction_flags, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool allow_deps, bool autoremove, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results repair_system (Pk.Bitfield transaction_flags, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results repair_system_async (Pk.Bitfield transaction_flags, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results repo_enable (string repo_id, bool enabled, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results repo_enable_async (string repo_id, bool enabled, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results repo_remove (Pk.Bitfield transaction_flags, string repo_id, bool autoremove, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results repo_remove_async (Pk.Bitfield transaction_flags, string repo_id, bool autoremove, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results repo_set_data (string repo_id, string parameter, string value, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results repo_set_data_async (string repo_id, string parameter, string value, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results required_by (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool recursive, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results required_by_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool recursive, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results resolve (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] packages, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results resolve_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] packages, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results search_details (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results search_details_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results search_files (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results search_files_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results search_groups (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results search_groups_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results search_names (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results search_names_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public void set_background (bool background);
+		public void set_cache_age (uint cache_age);
+		public void set_interactive (bool interactive);
+		public void set_locale (string locale);
+		public static void test (void* user_data);
+		public Pk.Results update_packages (Pk.Bitfield transaction_flags, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results update_packages_async (Pk.Bitfield transaction_flags, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results what_provides (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_client_generic_finish")]
+		public async Pk.Results what_provides_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public bool background { get; set; }
+		public uint cache_age { get; set; }
+		public bool idle { get; }
+		public bool interactive { get; set; }
+		public string locale { get; set; }
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_client_helper_get_type ()")]
+	public class ClientHelper : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public ClientHelper ();
+		public bool start (string socket_filename, string argv, string envp) throws GLib.Error;
+		public bool stop () throws GLib.Error;
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_control_get_type ()")]
+	public class Control : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Control ();
+		public async Pk.Authorize can_authorize_async (string action_id, GLib.Cancellable? cancellable) throws GLib.Error;
+		[NoWrapper]
+		public virtual void connection_changed (bool connected);
+		public async string get_daemon_state_async (GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool get_properties (GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async bool get_properties_async (GLib.Cancellable? cancellable) throws GLib.Error;
+		public async string get_tid_async (GLib.Cancellable? cancellable) throws GLib.Error;
+		public async uint get_time_since_action_async (Pk.Role role, GLib.Cancellable? cancellable) throws GLib.Error;
+		[CCode (array_length = false, array_null_terminated = true)]
+		public string[] get_transaction_list (GLib.Cancellable? cancellable = null) throws GLib.Error;
+		[CCode (array_length = false, array_null_terminated = true)]
+		public async string[] get_transaction_list_async (GLib.Cancellable? cancellable) throws GLib.Error;
+		[NoWrapper]
+		public virtual void network_state_changed ();
+		public bool set_proxy (string proxy_http, string proxy_ftp, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public bool set_proxy2 (string proxy_http, string proxy_https, string proxy_ftp, string proxy_socks, string no_proxy, string pac, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async void set_proxy2_async (string proxy_http, string proxy_https, string proxy_ftp, string proxy_socks, string no_proxy, string pac, GLib.Cancellable? cancellable);
+		public async bool set_proxy_async (string proxy_http, string proxy_ftp, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool suggest_daemon_quit (GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async bool suggest_daemon_quit_async (GLib.Cancellable? cancellable) throws GLib.Error;
+		public static void test (void* user_data);
+		[NoAccessorMethod]
+		public string backend_author { owned get; set; }
+		[NoAccessorMethod]
+		public string backend_description { owned get; set; }
+		[NoAccessorMethod]
+		public string backend_name { owned get; set; }
+		[NoAccessorMethod]
+		public bool connected { get; set; }
+		[NoAccessorMethod]
+		public string distro_id { owned get; set; }
+		[NoAccessorMethod]
+		public uint64 filters { get; set; }
+		[NoAccessorMethod]
+		public uint64 groups { get; set; }
+		[NoAccessorMethod]
+		public virtual bool locked { get; set; }
+		[CCode (array_length = false, array_null_terminated = true)]
+		[NoAccessorMethod]
+		public string[] mime_types { owned get; set; }
+		[NoAccessorMethod]
+		public Pk.Network network_state { get; set; }
+		[NoAccessorMethod]
+		public uint64 provides { get; set; }
+		[NoAccessorMethod]
+		public uint64 roles { get; set; }
+		[NoAccessorMethod]
+		public uint version_major { get; }
+		[NoAccessorMethod]
+		public uint version_micro { get; }
+		[NoAccessorMethod]
+		public uint version_minor { get; }
+		public virtual signal void repo_list_changed ();
+		public virtual signal void restart_schedule ();
+		public virtual signal void transaction_list_changed ([CCode (array_length = false, array_null_terminated = true)] string[] transaction_ids);
+		public virtual signal void updates_changed ();
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_desktop_get_type ()")]
+	public class Desktop : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Desktop ();
+		public GLib.GenericArray<weak string> get_files_for_package (string package) throws GLib.Error;
+		public string get_package_for_file (string filename) throws GLib.Error;
+		public GLib.GenericArray<weak string> get_shown_for_package (string package) throws GLib.Error;
+		public bool open_database () throws GLib.Error;
+		public static void test (void* user_data);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_details_get_type ()")]
+	public class Details : Pk.Source {
+		[CCode (has_construct_function = false)]
+		public Details ();
+		public unowned string get_description ();
+		public Pk.Group get_group ();
+		public unowned string get_license ();
+		public unowned string get_package_id ();
+		public uint64 get_size ();
+		public unowned string get_summary ();
+		public unowned string get_url ();
+		[NoAccessorMethod]
+		public string description { owned get; set; }
+		[NoAccessorMethod]
+		public Pk.Group group { get; set; }
+		[NoAccessorMethod]
+		public string license { owned get; set; }
+		[NoAccessorMethod]
+		public string package_id { owned get; set; }
+		[NoAccessorMethod]
+		public uint64 size { get; set; }
+		[NoAccessorMethod]
+		public string summary { owned get; set; }
+		[NoAccessorMethod]
+		public string url { owned get; set; }
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_distro_upgrade_get_type ()")]
+	public class DistroUpgrade : Pk.Source {
+		[CCode (has_construct_function = false)]
+		public DistroUpgrade ();
+		public unowned string get_id ();
+		public Pk.DistroUpgradeEnum get_state ();
+		public unowned string get_summary ();
+		[NoAccessorMethod]
+		public string name { owned get; set; }
+		[NoAccessorMethod]
+		public Pk.DistroUpgradeEnum state { get; set; }
+		[NoAccessorMethod]
+		public string summary { owned get; set; }
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_error_get_type ()")]
+	public class Error : Pk.Source {
+		[CCode (has_construct_function = false)]
+		public Error ();
+		public Pk.ErrorEnum get_code ();
+		public unowned string get_details ();
+		[NoAccessorMethod]
+		public Pk.ErrorEnum code { get; set; }
+		[NoAccessorMethod]
+		public string details { owned get; set; }
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_eula_required_get_type ()")]
+	public class EulaRequired : Pk.Source {
+		[CCode (has_construct_function = false)]
+		public EulaRequired ();
+		[NoAccessorMethod]
+		public string eula_id { owned get; set; }
+		[NoAccessorMethod]
+		public string license_agreement { owned get; set; }
+		[NoAccessorMethod]
+		public string package_id { owned get; set; }
+		[NoAccessorMethod]
+		public string vendor_name { owned get; set; }
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_files_get_type ()")]
+	public class Files : Pk.Source {
+		[CCode (has_construct_function = false)]
+		public Files ();
+		[CCode (array_length = false, array_null_terminated = true)]
+		public unowned string[] get_files ();
+		public unowned string get_package_id ();
+		[CCode (array_length = false, array_null_terminated = true)]
+		[NoAccessorMethod]
+		public string[] files { owned get; set; }
+		[NoAccessorMethod]
+		public string package_id { owned get; set; }
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_item_progress_get_type ()")]
+	public class ItemProgress : Pk.Source {
+		[CCode (has_construct_function = false)]
+		public ItemProgress ();
+		public unowned string get_package_id ();
+		public uint get_percentage ();
+		public Pk.Status get_status ();
+		[NoAccessorMethod]
+		public string package_id { owned get; set; }
+		[NoAccessorMethod]
+		public uint percentage { get; set; }
+		[NoAccessorMethod]
+		public uint status { get; set; }
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_media_change_required_get_type ()")]
+	public class MediaChangeRequired : Pk.Source {
+		[CCode (has_construct_function = false)]
+		public MediaChangeRequired ();
+		[NoAccessorMethod]
+		public string media_id { owned get; set; }
+		[NoAccessorMethod]
+		public string media_text { owned get; set; }
+		[NoAccessorMethod]
+		public Pk.MediaType media_type { get; set; }
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_package_get_type ()")]
+	public class Package : Pk.Source {
+		[CCode (has_construct_function = false)]
+		public Package ();
+		public bool equal (Pk.Package package2);
+		public bool equal_id (Pk.Package package2);
+		public unowned string get_arch ();
+		public unowned string get_data ();
+		public unowned string get_id ();
+		public Pk.Info get_info ();
+		public unowned string get_name ();
+		public unowned string get_summary ();
+		public unowned string get_version ();
+		public static string id_build (string name, string version, string arch, string data);
+		public static bool id_check (string package_id);
+		public static bool id_equal_fuzzy_arch (string package_id1, string package_id2);
+		[CCode (array_length = false, array_null_terminated = true)]
+		public static string[] id_split (string package_id);
+		public static void id_test (void* user_data);
+		public static string id_to_printable (string package_id);
+		[CCode (array_length = false, array_null_terminated = true)]
+		public static string[] ids_add_id (string package_ids, string package_id);
+		[CCode (array_length = false, array_null_terminated = true)]
+		public static string[] ids_add_ids (string package_ids, string package_ids_new);
+		public static bool ids_check (string package_ids);
+		[CCode (array_length = false, array_null_terminated = true)]
+		public static string[] ids_from_id (string package_id);
+		[CCode (array_length = false, array_null_terminated = true)]
+		public static string[] ids_from_string (string package_id);
+		public static bool ids_present_id (string package_ids, string package_id);
+		[CCode (array_length = false, array_null_terminated = true)]
+		public static string[] ids_remove_id (string package_ids, string package_id);
+		public static void ids_test (void* user_data);
+		public static string ids_to_string (string package_ids);
+		public bool parse (string data) throws GLib.Error;
+		public void print ();
+		public bool set_id (string package_id) throws GLib.Error;
+		public void set_info (Pk.Info info);
+		public void set_summary (string summary);
+		public static void test (void* user_data);
+		[NoAccessorMethod]
+		public string description { owned get; set; }
+		[NoAccessorMethod]
+		public Pk.Group group { get; set; }
+		public Pk.Info info { get; set; }
+		[NoAccessorMethod]
+		public string license { owned get; set; }
+		[NoAccessorMethod]
+		public string package_id { owned get; }
+		[NoAccessorMethod]
+		public uint64 size { get; set; }
+		public string summary { get; set; }
+		[CCode (array_length = false, array_null_terminated = true)]
+		[NoAccessorMethod]
+		public string[] update_bugzilla_urls { owned get; set; }
+		[NoAccessorMethod]
+		public string update_changelog { owned get; set; }
+		[CCode (array_length = false, array_null_terminated = true)]
+		[NoAccessorMethod]
+		public string[] update_cve_urls { owned get; set; }
+		[NoAccessorMethod]
+		public string update_issued { owned get; set; }
+		[NoAccessorMethod]
+		public string update_obsoletes { owned get; set; }
+		[NoAccessorMethod]
+		public Pk.Restart update_restart { get; set; }
+		[NoAccessorMethod]
+		public Pk.UpdateState update_state { get; set; }
+		[NoAccessorMethod]
+		public string update_text { owned get; set; }
+		[NoAccessorMethod]
+		public string update_updated { owned get; set; }
+		[NoAccessorMethod]
+		public string update_updates { owned get; set; }
+		[CCode (array_length = false, array_null_terminated = true)]
+		[NoAccessorMethod]
+		public string[] update_vendor_urls { owned get; set; }
+		[NoAccessorMethod]
+		public string url { owned get; set; }
+		public virtual signal void changed ();
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_package_sack_get_type ()")]
+	public class PackageSack : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public PackageSack ();
+		public bool add_package (Pk.Package package);
+		public bool add_package_by_id (string package_id) throws GLib.Error;
+		public bool add_packages_from_file (GLib.File file) throws GLib.Error;
+		[NoWrapper]
+		public virtual void changed ();
+		public void clear ();
+		public Pk.PackageSack filter (Pk.PackageSackFilterFunc filter_cb);
+		public Pk.PackageSack filter_by_info (Pk.Info info);
+		public Pk.Package find_by_id (string package_id);
+		public Pk.Package find_by_id_name_arch (string package_id);
+		public GLib.GenericArray<weak Pk.Package> get_array ();
+		public bool get_details (GLib.Cancellable? cancellable = null) throws GLib.Error;
+		[CCode (finish_name = "pk_package_sack_merge_generic_finish")]
+		public async bool get_details_async (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (array_length = false, array_null_terminated = true)]
+		public string[] get_ids ();
+		public uint get_size ();
+		public uint64 get_total_bytes ();
+		public bool get_update_detail (GLib.Cancellable? cancellable = null) throws GLib.Error;
+		[CCode (finish_name = "pk_package_sack_merge_generic_finish")]
+		public async bool get_update_detail_async (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public bool remove_by_filter (Pk.PackageSackFilterFunc filter_cb);
+		public bool remove_package (Pk.Package package);
+		public bool remove_package_by_id (string package_id);
+		public bool resolve (GLib.Cancellable? cancellable = null) throws GLib.Error;
+		[CCode (finish_name = "pk_package_sack_merge_generic_finish")]
+		public async bool resolve_async (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public void sort (Pk.PackageSackSortType type);
+		public static void test (void* user_data);
+		public bool to_file (GLib.File file) throws GLib.Error;
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	[Compact]
+	public class PackageSackResults {
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_progress_get_type ()")]
+	public class Progress : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Progress ();
+		public bool set_allow_cancel (bool allow_cancel);
+		public bool set_caller_active (bool caller_active);
+		public bool set_download_size_remaining (uint64 download_size_remaining);
+		public bool set_elapsed_time (uint elapsed_time);
+		public bool set_item_progress (Pk.ItemProgress item_progress);
+		public bool set_package (Pk.Package package);
+		public bool set_package_id (string package_id);
+		public bool set_percentage (int percentage);
+		public bool set_remaining_time (uint remaining_time);
+		public bool set_role (Pk.Role role);
+		public bool set_speed (uint speed);
+		public bool set_status (Pk.Status status);
+		public bool set_transaction_flags (uint64 transaction_flags);
+		public bool set_transaction_id (string package_id);
+		public bool set_uid (uint uid);
+		public static void test (void* user_data);
+		[NoAccessorMethod]
+		public bool allow_cancel { get; set; }
+		[NoAccessorMethod]
+		public bool caller_active { get; set; }
+		[NoAccessorMethod]
+		public uint download_size_remaining { get; set; }
+		[NoAccessorMethod]
+		public uint elapsed_time { get; set; }
+		[NoAccessorMethod]
+		public Pk.ItemProgress item_progress { owned get; set; }
+		[NoAccessorMethod]
+		public Pk.Package package { owned get; set; }
+		[NoAccessorMethod]
+		public string package_id { owned get; set; }
+		[NoAccessorMethod]
+		public int percentage { get; set; }
+		[NoAccessorMethod]
+		public uint remaining_time { get; set; }
+		[NoAccessorMethod]
+		public uint role { get; set; }
+		[NoAccessorMethod]
+		public uint speed { get; set; }
+		[NoAccessorMethod]
+		public uint status { get; set; }
+		[NoAccessorMethod]
+		public uint64 transaction_flags { get; set; }
+		[NoAccessorMethod]
+		public string transaction_id { owned get; set; }
+		[NoAccessorMethod]
+		public uint uid { get; set; }
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_repo_detail_get_type ()")]
+	public class RepoDetail : Pk.Source {
+		[CCode (has_construct_function = false)]
+		public RepoDetail ();
+		public unowned string get_description ();
+		public bool get_enabled ();
+		public unowned string get_id ();
+		[NoAccessorMethod]
+		public string description { owned get; set; }
+		[NoAccessorMethod]
+		public bool enabled { get; set; }
+		[NoAccessorMethod]
+		public string repo_id { owned get; set; }
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_repo_signature_required_get_type ()")]
+	public class RepoSignatureRequired : Pk.Source {
+		[CCode (has_construct_function = false)]
+		public RepoSignatureRequired ();
+		[NoAccessorMethod]
+		public string key_fingerprint { owned get; set; }
+		[NoAccessorMethod]
+		public string key_id { owned get; set; }
+		[NoAccessorMethod]
+		public string key_timestamp { owned get; set; }
+		[NoAccessorMethod]
+		public string key_url { owned get; set; }
+		[NoAccessorMethod]
+		public string key_userid { owned get; set; }
+		[NoAccessorMethod]
+		public string package_id { owned get; set; }
+		[NoAccessorMethod]
+		public string repository_name { owned get; set; }
+		[NoAccessorMethod]
+		public Pk.SigType type { get; set; }
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_require_restart_get_type ()")]
+	public class RequireRestart : Pk.Source {
+		[CCode (has_construct_function = false)]
+		public RequireRestart ();
+		[NoAccessorMethod]
+		public string package_id { owned get; set; }
+		[NoAccessorMethod]
+		public Pk.Restart restart { get; set; }
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_results_get_type ()")]
+	public class Results : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Results ();
+		public bool add_category (Pk.Category item);
+		public bool add_details (Pk.Details item);
+		public bool add_distro_upgrade (Pk.DistroUpgrade item);
+		public bool add_eula_required (Pk.EulaRequired item);
+		public bool add_files (Pk.Files item);
+		public bool add_media_change_required (Pk.MediaChangeRequired item);
+		public bool add_package (Pk.Package item);
+		public bool add_repo_detail (Pk.RepoDetail item);
+		public bool add_repo_signature_required (Pk.RepoSignatureRequired item);
+		public bool add_require_restart (Pk.RequireRestart item);
+		public bool add_transaction (Pk.TransactionPast item);
+		public bool add_update_detail (Pk.UpdateDetail item);
+		public GLib.GenericArray<weak Pk.Category> get_category_array ();
+		public GLib.GenericArray<weak Pk.Details> get_details_array ();
+		public GLib.GenericArray<weak Pk.DistroUpgrade> get_distro_upgrade_array ();
+		public Pk.Error get_error_code ();
+		public GLib.GenericArray<weak Pk.EulaRequired> get_eula_required_array ();
+		public Pk.Exit get_exit_code ();
+		public GLib.GenericArray<weak Pk.Files> get_files_array ();
+		public GLib.GenericArray<weak Pk.MediaChangeRequired> get_media_change_required_array ();
+		public GLib.GenericArray<weak Pk.Package> get_package_array ();
+		public Pk.PackageSack get_package_sack ();
+		public GLib.GenericArray<weak Pk.RepoDetail> get_repo_detail_array ();
+		public GLib.GenericArray<weak Pk.RepoSignatureRequired> get_repo_signature_required_array ();
+		public GLib.GenericArray<weak Pk.RequireRestart> get_require_restart_array ();
+		public Pk.Restart get_require_restart_worst ();
+		public Pk.Role get_role ();
+		public GLib.GenericArray<weak Pk.TransactionPast> get_transaction_array ();
+		public Pk.Bitfield get_transaction_flags ();
+		public GLib.GenericArray<weak Pk.UpdateDetail> get_update_detail_array ();
+		public bool set_error_code (Pk.Error item);
+		public bool set_exit_code (Pk.Exit exit_enum);
+		public static void test (void* user_data);
+		[NoAccessorMethod]
+		public uint inputs { get; set; }
+		[NoAccessorMethod]
+		public Pk.Progress progress { owned get; set; }
+		[NoAccessorMethod]
+		public Pk.Role role { get; set; }
+		[NoAccessorMethod]
+		public uint64 transaction_flags { get; set; }
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_source_get_type ()")]
+	public class Source : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Source ();
+		[NoAccessorMethod]
+		public Pk.Role role { get; set; }
+		[NoAccessorMethod]
+		public string transaction_id { owned get; set; }
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_task_get_type ()")]
+	public class Task : Pk.Client {
+		[CCode (has_construct_function = false)]
+		public Task ();
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results depends_on_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool recursive, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results depends_on_sync (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool recursive, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results download_packages_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, string directory, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results download_packages_sync ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, string directory, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[NoWrapper]
+		public virtual void eula_question (uint request, Pk.Results results);
+		public bool get_allow_downgrade ();
+		public bool get_allow_reinstall ();
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results get_categories_async (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results get_categories_sync (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results get_details_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results get_details_sync ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results get_files_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results get_files_sync ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public bool get_interactive ();
+		public bool get_only_download ();
+		public bool get_only_trusted ();
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results get_packages_async (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results get_packages_sync (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results get_repo_list_async (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results get_repo_list_sync (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public bool get_simulate ();
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results get_update_detail_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results get_update_detail_sync ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results get_updates_async (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results get_updates_sync (Pk.Bitfield filters, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results install_files_async ([CCode (array_length = false, array_null_terminated = true)] string[] files, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results install_files_sync ([CCode (array_length = false, array_null_terminated = true)] string[] files, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results install_packages_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results install_packages_sync ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[NoWrapper]
+		public virtual void key_question (uint request, Pk.Results results);
+		[NoWrapper]
+		public virtual void media_change_question (uint request, Pk.Results results);
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results refresh_cache_async (bool force, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results refresh_cache_sync (bool force, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results remove_packages_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool allow_deps, bool autoremove, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results remove_packages_sync ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool allow_deps, bool autoremove, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[NoWrapper]
+		public virtual void repair_question (uint request, Pk.Results results);
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results repair_system_async (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results repair_system_sync (GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results repo_enable_async (string repo_id, bool enabled, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results repo_enable_sync (string repo_id, bool enabled, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results required_by_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool recursive, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results required_by_sync (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] package_ids, bool recursive, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results resolve_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] packages, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results resolve_sync (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] packages, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results search_details_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results search_details_sync (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results search_files_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results search_files_sync (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results search_groups_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results search_groups_sync (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results search_names_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results search_names_sync (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public void set_allow_downgrade (bool allow_downgrade);
+		public void set_allow_reinstall (bool allow_reinstall);
+		public void set_interactive (bool interactive);
+		public void set_only_download (bool only_download);
+		public void set_only_trusted (bool only_trusted);
+		public void set_simulate (bool simulate);
+		[NoWrapper]
+		public virtual void simulate_question (uint request, Pk.Results results);
+		public static void test (void* user_data);
+		[NoWrapper]
+		public virtual void untrusted_question (uint request, Pk.Results results);
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results update_packages_async ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results update_packages_sync ([CCode (array_length = false, array_null_terminated = true)] string[] package_ids, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public bool user_accepted (uint request);
+		public bool user_declined (uint request);
+		[CCode (finish_name = "pk_task_generic_finish")]
+		public async Pk.Results what_provides_async (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public Pk.Results what_provides_sync (Pk.Bitfield filters, [CCode (array_length = false, array_null_terminated = true)] string[] values, GLib.Cancellable? cancellable, Pk.ProgressCallback progress_callback) throws GLib.Error;
+		public bool allow_downgrade { get; set; }
+		public bool allow_reinstall { get; set; }
+		public bool only_download { get; set; }
+		public bool only_trusted { get; set; }
+		public bool simulate { get; set; }
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_transaction_list_get_type ()")]
+	public class TransactionList : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public TransactionList ();
+		[CCode (array_length = false, array_null_terminated = true)]
+		public string[] get_ids ();
+		public static void test (void* user_data);
+		public virtual signal void added (string tid);
+		public virtual signal void removed (string tid);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_transaction_past_get_type ()")]
+	public class TransactionPast : Pk.Source {
+		[CCode (has_construct_function = false)]
+		public TransactionPast ();
+		public unowned string get_cmdline ();
+		public unowned string get_data ();
+		public GLib.DateTime get_datetime ();
+		public uint get_duration ();
+		public unowned string get_id ();
+		public Pk.Role get_role ();
+		public bool get_succeeded ();
+		public unowned string get_timespec ();
+		public int64 get_timestamp ();
+		public uint get_uid ();
+		[NoAccessorMethod]
+		public string cmdline { owned get; set; }
+		[NoAccessorMethod]
+		public string data { owned get; set; }
+		[NoAccessorMethod]
+		public uint duration { get; set; }
+		[NoAccessorMethod]
+		public Pk.Role role { get; set; }
+		[NoAccessorMethod]
+		public bool succeeded { get; set; }
+		[NoAccessorMethod]
+		public string tid { owned get; set; }
+		[NoAccessorMethod]
+		public string timespec { owned get; set; }
+		[NoAccessorMethod]
+		public uint uid { get; set; }
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", type_id = "pk_update_detail_get_type ()")]
+	public class UpdateDetail : Pk.Source {
+		[CCode (has_construct_function = false)]
+		public UpdateDetail ();
+		[CCode (array_length = false, array_null_terminated = true)]
+		public unowned string[] get_bugzilla_urls ();
+		public unowned string get_changelog ();
+		[CCode (array_length = false, array_null_terminated = true)]
+		public unowned string[] get_cve_urls ();
+		public unowned string get_issued ();
+		[CCode (array_length = false, array_null_terminated = true)]
+		public unowned string[] get_obsoletes ();
+		public unowned string get_package_id ();
+		public Pk.Restart get_restart ();
+		public Pk.UpdateState get_state ();
+		public unowned string get_update_text ();
+		public unowned string get_updated ();
+		[CCode (array_length = false, array_null_terminated = true)]
+		public unowned string[] get_updates ();
+		[CCode (array_length = false, array_null_terminated = true)]
+		public unowned string[] get_vendor_urls ();
+		[CCode (array_length = false, array_null_terminated = true)]
+		[NoAccessorMethod]
+		public string[] bugzilla_urls { owned get; set; }
+		[NoAccessorMethod]
+		public string changelog { owned get; set; }
+		[CCode (array_length = false, array_null_terminated = true)]
+		[NoAccessorMethod]
+		public string[] cve_urls { owned get; set; }
+		[NoAccessorMethod]
+		public string issued { owned get; set; }
+		[CCode (array_length = false, array_null_terminated = true)]
+		[NoAccessorMethod]
+		public string[] obsoletes { owned get; set; }
+		[NoAccessorMethod]
+		public string package_id { owned get; set; }
+		[NoAccessorMethod]
+		public Pk.Restart restart { get; set; }
+		[NoAccessorMethod]
+		public Pk.UpdateState state { get; set; }
+		[NoAccessorMethod]
+		public string update_text { owned get; set; }
+		[NoAccessorMethod]
+		public string updated { owned get; set; }
+		[CCode (array_length = false, array_null_terminated = true)]
+		[NoAccessorMethod]
+		public string[] updates { owned get; set; }
+		[CCode (array_length = false, array_null_terminated = true)]
+		[NoAccessorMethod]
+		public string[] vendor_urls { owned get; set; }
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	[SimpleType]
+	public struct Bitfield : uint64 {
+		public static void test (void* user_data);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", has_type_id = false)]
+	public struct EnumMatch {
+		public uint value;
+		public weak global::string string;
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkAuthorizeEnum", cprefix = "PK_AUTHORIZE_ENUM_", type_id = "pk_authorize_enum_get_type ()")]
+	[GIR (name = "AuthorizeEnum")]
+	public enum Authorize {
+		UNKNOWN,
+		YES,
+		NO,
+		INTERACTIVE,
+		LAST;
+		public static Pk.Authorize type_enum_from_string (string authorize_type);
+		public static unowned string type_enum_to_string (Pk.Authorize authorize_type);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_DISTRO_UPGRADE_ENUM_", type_id = "pk_distro_upgrade_enum_get_type ()")]
+	public enum DistroUpgradeEnum {
+		UNKNOWN,
+		STABLE,
+		UNSTABLE,
+		LAST;
+		public static Pk.DistroUpgradeEnum from_string (string upgrade);
+		public static unowned string to_string (Pk.DistroUpgradeEnum upgrade);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_ERROR_ENUM_", type_id = "pk_error_enum_get_type ()")]
+	public enum ErrorEnum {
+		UNKNOWN,
+		OOM,
+		NO_NETWORK,
+		NOT_SUPPORTED,
+		INTERNAL_ERROR,
+		GPG_FAILURE,
+		PACKAGE_ID_INVALID,
+		PACKAGE_NOT_INSTALLED,
+		PACKAGE_NOT_FOUND,
+		PACKAGE_ALREADY_INSTALLED,
+		PACKAGE_DOWNLOAD_FAILED,
+		GROUP_NOT_FOUND,
+		GROUP_LIST_INVALID,
+		DEP_RESOLUTION_FAILED,
+		FILTER_INVALID,
+		CREATE_THREAD_FAILED,
+		TRANSACTION_ERROR,
+		TRANSACTION_CANCELLED,
+		NO_CACHE,
+		REPO_NOT_FOUND,
+		CANNOT_REMOVE_SYSTEM_PACKAGE,
+		PROCESS_KILL,
+		FAILED_INITIALIZATION,
+		FAILED_FINALISE,
+		FAILED_CONFIG_PARSING,
+		CANNOT_CANCEL,
+		CANNOT_GET_LOCK,
+		NO_PACKAGES_TO_UPDATE,
+		CANNOT_WRITE_REPO_CONFIG,
+		LOCAL_INSTALL_FAILED,
+		BAD_GPG_SIGNATURE,
+		MISSING_GPG_SIGNATURE,
+		CANNOT_INSTALL_SOURCE_PACKAGE,
+		REPO_CONFIGURATION_ERROR,
+		NO_LICENSE_AGREEMENT,
+		FILE_CONFLICTS,
+		PACKAGE_CONFLICTS,
+		REPO_NOT_AVAILABLE,
+		INVALID_PACKAGE_FILE,
+		PACKAGE_INSTALL_BLOCKED,
+		PACKAGE_CORRUPT,
+		ALL_PACKAGES_ALREADY_INSTALLED,
+		FILE_NOT_FOUND,
+		NO_MORE_MIRRORS_TO_TRY,
+		NO_DISTRO_UPGRADE_DATA,
+		INCOMPATIBLE_ARCHITECTURE,
+		NO_SPACE_ON_DEVICE,
+		MEDIA_CHANGE_REQUIRED,
+		NOT_AUTHORIZED,
+		UPDATE_NOT_FOUND,
+		CANNOT_INSTALL_REPO_UNSIGNED,
+		CANNOT_UPDATE_REPO_UNSIGNED,
+		CANNOT_GET_FILELIST,
+		CANNOT_GET_REQUIRES,
+		CANNOT_DISABLE_REPOSITORY,
+		RESTRICTED_DOWNLOAD,
+		PACKAGE_FAILED_TO_CONFIGURE,
+		PACKAGE_FAILED_TO_BUILD,
+		PACKAGE_FAILED_TO_INSTALL,
+		PACKAGE_FAILED_TO_REMOVE,
+		UPDATE_FAILED_DUE_TO_RUNNING_PROCESS,
+		PACKAGE_DATABASE_CHANGED,
+		PROVIDE_TYPE_NOT_SUPPORTED,
+		INSTALL_ROOT_INVALID,
+		CANNOT_FETCH_SOURCES,
+		CANCELLED_PRIORITY,
+		UNFINISHED_TRANSACTION,
+		LOCK_REQUIRED,
+		LAST;
+		public static Pk.ErrorEnum from_string (string code);
+		public static unowned string to_string (Pk.ErrorEnum code);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkExitEnum", cprefix = "PK_EXIT_ENUM_", type_id = "pk_exit_enum_get_type ()")]
+	[GIR (name = "ExitEnum")]
+	public enum Exit {
+		UNKNOWN,
+		SUCCESS,
+		FAILED,
+		CANCELLED,
+		KEY_REQUIRED,
+		EULA_REQUIRED,
+		KILLED,
+		MEDIA_CHANGE_REQUIRED,
+		NEED_UNTRUSTED,
+		CANCELLED_PRIORITY,
+		SKIP_TRANSACTION,
+		REPAIR_REQUIRED,
+		LAST;
+		public static Pk.Exit enum_from_string (string exit);
+		public static unowned string enum_to_string (Pk.Exit exit);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkFilterEnum", cprefix = "PK_FILTER_ENUM_", type_id = "pk_filter_enum_get_type ()")]
+	[GIR (name = "FilterEnum")]
+	public enum Filter {
+		UNKNOWN,
+		NONE,
+		INSTALLED,
+		NOT_INSTALLED,
+		DEVELOPMENT,
+		NOT_DEVELOPMENT,
+		GUI,
+		NOT_GUI,
+		FREE,
+		NOT_FREE,
+		VISIBLE,
+		NOT_VISIBLE,
+		SUPPORTED,
+		NOT_SUPPORTED,
+		BASENAME,
+		NOT_BASENAME,
+		NEWEST,
+		NOT_NEWEST,
+		ARCH,
+		NOT_ARCH,
+		SOURCE,
+		NOT_SOURCE,
+		COLLECTIONS,
+		NOT_COLLECTIONS,
+		APPLICATION,
+		NOT_APPLICATION,
+		DOWNLOADED,
+		NOT_DOWNLOADED,
+		LAST;
+		public static Pk.Bitfield bitfield_from_string (string filters);
+		public static string bitfield_to_string (Pk.Bitfield filters);
+		public static Pk.Filter enum_from_string (string filter);
+		public static unowned string enum_to_string (Pk.Filter filter);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkGroupEnum", cprefix = "PK_GROUP_ENUM_", type_id = "pk_group_enum_get_type ()")]
+	[GIR (name = "GroupEnum")]
+	public enum Group {
+		UNKNOWN,
+		ACCESSIBILITY,
+		ACCESSORIES,
+		ADMIN_TOOLS,
+		COMMUNICATION,
+		DESKTOP_GNOME,
+		DESKTOP_KDE,
+		DESKTOP_OTHER,
+		DESKTOP_XFCE,
+		EDUCATION,
+		FONTS,
+		GAMES,
+		GRAPHICS,
+		INTERNET,
+		LEGACY,
+		LOCALIZATION,
+		MAPS,
+		MULTIMEDIA,
+		NETWORK,
+		OFFICE,
+		OTHER,
+		POWER_MANAGEMENT,
+		PROGRAMMING,
+		PUBLISHING,
+		REPOS,
+		SECURITY,
+		SERVERS,
+		SYSTEM,
+		VIRTUALIZATION,
+		SCIENCE,
+		DOCUMENTATION,
+		ELECTRONICS,
+		COLLECTIONS,
+		VENDOR,
+		NEWEST,
+		LAST;
+		public static Pk.Bitfield bitfield_from_string (string groups);
+		public static string bitfield_to_string (Pk.Bitfield groups);
+		public static Pk.Group enum_from_string (string group);
+		public static unowned string enum_to_string (Pk.Group group);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkInfoEnum", cprefix = "PK_INFO_ENUM_", type_id = "pk_info_enum_get_type ()")]
+	[GIR (name = "InfoEnum")]
+	public enum Info {
+		UNKNOWN,
+		INSTALLED,
+		AVAILABLE,
+		LOW,
+		ENHANCEMENT,
+		NORMAL,
+		BUGFIX,
+		IMPORTANT,
+		SECURITY,
+		BLOCKED,
+		DOWNLOADING,
+		UPDATING,
+		INSTALLING,
+		REMOVING,
+		CLEANUP,
+		OBSOLETING,
+		COLLECTION_INSTALLED,
+		COLLECTION_AVAILABLE,
+		FINISHED,
+		REINSTALLING,
+		DOWNGRADING,
+		PREPARING,
+		DECOMPRESSING,
+		UNTRUSTED,
+		TRUSTED,
+		UNAVAILABLE,
+		LAST;
+		public static Pk.Info enum_from_string (string info);
+		public static unowned string enum_to_localised_past (Pk.Info info);
+		public static unowned string enum_to_localised_present (Pk.Info info);
+		public static unowned string enum_to_string (Pk.Info info);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkMediaTypeEnum", cprefix = "PK_MEDIA_TYPE_ENUM_", type_id = "pk_media_type_enum_get_type ()")]
+	[GIR (name = "MediaTypeEnum")]
+	public enum MediaType {
+		UNKNOWN,
+		CD,
+		DVD,
+		DISC,
+		LAST;
+		public static Pk.MediaType enum_from_string (string media_type);
+		public static unowned string enum_to_string (Pk.MediaType media_type);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkNetworkEnum", cprefix = "PK_NETWORK_ENUM_", type_id = "pk_network_enum_get_type ()")]
+	[GIR (name = "NetworkEnum")]
+	public enum Network {
+		UNKNOWN,
+		OFFLINE,
+		ONLINE,
+		WIRED,
+		WIFI,
+		MOBILE,
+		LAST;
+		public static Pk.Network enum_from_string (string network);
+		public static unowned string enum_to_string (Pk.Network network);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_OFFLINE_ACTION_", type_id = "pk_offline_action_get_type ()")]
+	public enum OfflineAction {
+		UNKNOWN,
+		REBOOT,
+		POWER_OFF,
+		UNSET,
+		LAST;
+		public static Pk.OfflineAction from_string (string action);
+		public static unowned string to_string (Pk.OfflineAction action);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_PACKAGE_SACK_SORT_TYPE_", type_id = "pk_package_sack_sort_type_get_type ()")]
+	public enum PackageSackSortType {
+		NAME,
+		INFO,
+		PACKAGE_ID,
+		SUMMARY,
+		LAST
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_PROGRESS_TYPE_", type_id = "pk_progress_type_get_type ()")]
+	public enum ProgressType {
+		PACKAGE_ID,
+		TRANSACTION_ID,
+		PERCENTAGE,
+		ALLOW_CANCEL,
+		STATUS,
+		ROLE,
+		CALLER_ACTIVE,
+		ELAPSED_TIME,
+		REMAINING_TIME,
+		SPEED,
+		DOWNLOAD_SIZE_REMAINING,
+		UID,
+		PACKAGE,
+		ITEM_PROGRESS,
+		TRANSACTION_FLAGS,
+		INVALID
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkRestartEnum", cprefix = "PK_RESTART_ENUM_", type_id = "pk_restart_enum_get_type ()")]
+	[GIR (name = "RestartEnum")]
+	public enum Restart {
+		UNKNOWN,
+		NONE,
+		APPLICATION,
+		SESSION,
+		SYSTEM,
+		SECURITY_SESSION,
+		SECURITY_SYSTEM,
+		LAST;
+		public static Pk.Restart enum_from_string (string restart);
+		public static unowned string enum_to_string (Pk.Restart restart);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkRoleEnum", cprefix = "PK_ROLE_ENUM_", type_id = "pk_role_enum_get_type ()")]
+	[GIR (name = "RoleEnum")]
+	public enum Role {
+		UNKNOWN,
+		CANCEL,
+		DEPENDS_ON,
+		GET_DETAILS,
+		GET_FILES,
+		GET_PACKAGES,
+		GET_REPO_LIST,
+		REQUIRED_BY,
+		GET_UPDATE_DETAIL,
+		GET_UPDATES,
+		INSTALL_FILES,
+		INSTALL_PACKAGES,
+		INSTALL_SIGNATURE,
+		REFRESH_CACHE,
+		REMOVE_PACKAGES,
+		REPO_ENABLE,
+		REPO_SET_DATA,
+		RESOLVE,
+		SEARCH_DETAILS,
+		SEARCH_FILE,
+		SEARCH_GROUP,
+		SEARCH_NAME,
+		UPDATE_PACKAGES,
+		WHAT_PROVIDES,
+		ACCEPT_EULA,
+		DOWNLOAD_PACKAGES,
+		GET_DISTRO_UPGRADES,
+		GET_CATEGORIES,
+		GET_OLD_TRANSACTIONS,
+		REPAIR_SYSTEM,
+		GET_DETAILS_LOCAL,
+		GET_FILES_LOCAL,
+		REPO_REMOVE,
+		LAST;
+		public static Pk.Bitfield bitfield_from_string (string roles);
+		public static string bitfield_to_string (Pk.Bitfield roles);
+		public static Pk.Role enum_from_string (string role);
+		public static unowned string enum_to_localised_present (Pk.Role role);
+		public static unowned string enum_to_string (Pk.Role role);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkSigTypeEnum", cprefix = "PK_SIGTYPE_ENUM_", type_id = "pk_sig_type_enum_get_type ()")]
+	[GIR (name = "SigTypeEnum")]
+	public enum SigType {
+		UNKNOWN,
+		GPG,
+		LAST;
+		public static Pk.SigType enum_from_string (string sig_type);
+		public static unowned string enum_to_string (Pk.SigType sig_type);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkStatusEnum", cprefix = "PK_STATUS_ENUM_", type_id = "pk_status_enum_get_type ()")]
+	[GIR (name = "StatusEnum")]
+	public enum Status {
+		UNKNOWN,
+		WAIT,
+		SETUP,
+		RUNNING,
+		QUERY,
+		INFO,
+		REMOVE,
+		REFRESH_CACHE,
+		DOWNLOAD,
+		INSTALL,
+		UPDATE,
+		CLEANUP,
+		OBSOLETE,
+		DEP_RESOLVE,
+		SIG_CHECK,
+		TEST_COMMIT,
+		COMMIT,
+		REQUEST,
+		FINISHED,
+		CANCEL,
+		DOWNLOAD_REPOSITORY,
+		DOWNLOAD_PACKAGELIST,
+		DOWNLOAD_FILELIST,
+		DOWNLOAD_CHANGELOG,
+		DOWNLOAD_GROUP,
+		DOWNLOAD_UPDATEINFO,
+		REPACKAGING,
+		LOADING_CACHE,
+		SCAN_APPLICATIONS,
+		GENERATE_PACKAGE_LIST,
+		WAITING_FOR_LOCK,
+		WAITING_FOR_AUTH,
+		SCAN_PROCESS_LIST,
+		CHECK_EXECUTABLE_FILES,
+		CHECK_LIBRARIES,
+		COPY_FILES,
+		LAST;
+		public static Pk.Status enum_from_string (string status);
+		public static unowned string enum_to_localised_text (Pk.Status status);
+		public static unowned string enum_to_string (Pk.Status status);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkTransactionFlagEnum", cprefix = "PK_TRANSACTION_FLAG_ENUM_", type_id = "pk_transaction_flag_enum_get_type ()")]
+	[GIR (name = "TransactionFlagEnum")]
+	public enum TransactionFlag {
+		NONE,
+		ONLY_TRUSTED,
+		SIMULATE,
+		ONLY_DOWNLOAD,
+		ALLOW_REINSTALL,
+		JUST_REINSTALL,
+		ALLOW_DOWNGRADE,
+		LAST;
+		public static Pk.Bitfield bitfield_from_string (string transaction_flags);
+		public static string bitfield_to_string (Pk.Bitfield transaction_flags);
+		public static Pk.TransactionFlag enum_from_string (string transaction_flag);
+		public static unowned string enum_to_string (Pk.TransactionFlag transaction_flag);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkUpdateStateEnum", cprefix = "PK_UPDATE_STATE_ENUM_", type_id = "pk_update_state_enum_get_type ()")]
+	[GIR (name = "UpdateStateEnum")]
+	public enum UpdateState {
+		UNKNOWN,
+		STABLE,
+		UNSTABLE,
+		TESTING,
+		LAST;
+		public static Pk.UpdateState enum_from_string (string update_state);
+		public static unowned string enum_to_string (Pk.UpdateState update_state);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkUpgradeKindEnum", cprefix = "PK_UPGRADE_KIND_ENUM_", type_id = "pk_upgrade_kind_enum_get_type ()")]
+	[GIR (name = "UpgradeKindEnum")]
+	public enum UpgradeKind {
+		UNKNOWN,
+		MINIMAL,
+		DEFAULT,
+		COMPLETE,
+		LAST;
+		public static Pk.UpgradeKind enum_from_string (string upgrade_kind);
+		public static unowned string enum_to_string (Pk.UpgradeKind upgrade_kind);
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_CLIENT_ERROR_")]
+	public errordomain ClientError {
+		FAILED,
+		FAILED_AUTH,
+		NO_TID,
+		ALREADY_TID,
+		ROLE_UNKNOWN,
+		CANNOT_START_DAEMON,
+		INVALID_INPUT,
+		INVALID_FILE,
+		NOT_SUPPORTED,
+		DECLINED_SIMULATION,
+		LAST;
+		public static GLib.Quark quark ();
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_CONTROL_ERROR_")]
+	public errordomain ControlError {
+		FAILED,
+		CANNOT_START_DAEMON;
+		public static GLib.Quark quark ();
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_OFFLINE_ERROR_")]
+	public errordomain OfflineError {
+		FAILED,
+		INVALID_VALUE,
+		NO_DATA,
+		LAST;
+		public static GLib.Quark quark ();
+	}
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", instance_pos = 1.9)]
+	public delegate bool PackageSackFilterFunc (Pk.Package package);
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", instance_pos = 2.9)]
+	public delegate void ProgressCallback (Pk.Progress progress, Pk.ProgressType type);
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_DBUS_INTERFACE")]
+	public const string DBUS_INTERFACE;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_DBUS_INTERFACE_OFFLINE")]
+	public const string DBUS_INTERFACE_OFFLINE;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_DBUS_INTERFACE_TRANSACTION")]
+	public const string DBUS_INTERFACE_TRANSACTION;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_DBUS_PATH")]
+	public const string DBUS_PATH;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_DBUS_SERVICE")]
+	public const string DBUS_SERVICE;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_DESKTOP_DEFAULT_APPLICATION_DIR")]
+	public const string DESKTOP_DEFAULT_APPLICATION_DIR;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_MAJOR_VERSION")]
+	public const int MAJOR_VERSION;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_MICRO_VERSION")]
+	public const int MICRO_VERSION;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_MINOR_VERSION")]
+	public const int MINOR_VERSION;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_OFFLINE_DESTDIR")]
+	public const string OFFLINE_DESTDIR;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_OFFLINE_RESULTS_GROUP")]
+	public const string OFFLINE_RESULTS_GROUP;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_PACKAGE_IDS_DELIM")]
+	public const string PACKAGE_IDS_DELIM;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_PACKAGE_ID_ARCH")]
+	public const int PACKAGE_ID_ARCH;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_PACKAGE_ID_DATA")]
+	public const int PACKAGE_ID_DATA;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_PACKAGE_ID_NAME")]
+	public const int PACKAGE_ID_NAME;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_PACKAGE_ID_VERSION")]
+	public const int PACKAGE_ID_VERSION;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_SYSTEM_PACKAGE_CACHE_FILENAME")]
+	public const string SYSTEM_PACKAGE_CACHE_FILENAME;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PK_SYSTEM_PACKAGE_LIST_FILENAME")]
+	public const string SYSTEM_PACKAGE_LIST_FILENAME;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static void common_test (void* user_data);
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static void debug_add_log_domain (string log_domain);
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static bool debug_is_verbose ();
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static void debug_set_verbose (bool verbose);
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static unowned string enum_find_string (Pk.EnumMatch table, uint value);
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static uint enum_find_value (Pk.EnumMatch table, string string);
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static void enum_test (void* user_data);
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static string get_distro_id ();
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static string iso8601_from_date (GLib.Date date);
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static string iso8601_present ();
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static bool offline_auth_cancel () throws GLib.Error;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static bool offline_auth_clear_results () throws GLib.Error;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static bool offline_auth_invalidate () throws GLib.Error;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static bool offline_auth_set_action (Pk.OfflineAction action) throws GLib.Error;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static bool offline_auth_set_prepared_ids (string package_ids) throws GLib.Error;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static bool offline_auth_set_results (Pk.Results results) throws GLib.Error;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static bool offline_auth_trigger (Pk.OfflineAction action) throws GLib.Error;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static bool offline_cancel (GLib.Cancellable? cancellable = null) throws GLib.Error;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static bool offline_clear_results (GLib.Cancellable? cancellable = null) throws GLib.Error;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static Pk.OfflineAction offline_get_action () throws GLib.Error;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static GLib.FileMonitor offline_get_action_monitor (GLib.Cancellable? cancellable = null) throws GLib.Error;
+	[CCode (array_length = false, array_null_terminated = true, cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static string[] offline_get_prepared_ids () throws GLib.Error;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static GLib.FileMonitor offline_get_prepared_monitor (GLib.Cancellable? cancellable = null) throws GLib.Error;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static Pk.PackageSack offline_get_prepared_sack () throws GLib.Error;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static Pk.Results offline_get_results () throws GLib.Error;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static uint64 offline_get_results_mtime () throws GLib.Error;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static bool offline_trigger (Pk.OfflineAction action, GLib.Cancellable? cancellable = null) throws GLib.Error;
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static void polkit_agent_close ();
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static int polkit_agent_open ();
+	[CCode (array_length = false, array_null_terminated = true, cheader_filename = "packagekit-glib2/packagekit.h")]
+	public static string[] ptr_array_to_strv (GLib.GenericArray<string> array);
+}
diff --git a/src/scanner.c b/src/scanner.c
index 2d28a84..38fa7e5 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -4776,7 +4776,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 4779 "scanner.c"
-				goto __catch14_g_regex_error;
+				goto __catch15_g_regex_error;
 			}
 #line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4801,7 +4801,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 4804 "scanner.c"
-				goto __catch14_g_regex_error;
+				goto __catch15_g_regex_error;
 			}
 #line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -4827,8 +4827,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 4829 "scanner.c"
 	}
-	goto __finally14;
-	__catch14_g_regex_error:
+	goto __finally15;
+	__catch15_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
@@ -4841,7 +4841,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 4843 "scanner.c"
 	}
-	__finally14:
+	__finally15:
 #line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
@@ -12420,7 +12420,7 @@ void scanner_start (Scanner* self) {
 #line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12414 "scanner.c"
-			goto __catch15_g_error;
+			goto __catch16_g_error;
 		}
 #line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = _tmp0_;
@@ -12434,8 +12434,8 @@ void scanner_start (Scanner* self) {
 		_g_thread_unref0 (_tmp0_);
 #line 12427 "scanner.c"
 	}
-	goto __finally15;
-	__catch15_g_error:
+	goto __finally16;
+	__catch16_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp3_ = NULL;
@@ -12454,7 +12454,7 @@ void scanner_start (Scanner* self) {
 		_g_error_free0 (e);
 #line 12447 "scanner.c"
 	}
-	__finally15:
+	__finally16:
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
diff --git a/src/simple-scan.c b/src/simple-scan.c
index 38e44ab..504a0dc 100644
--- a/src/simple-scan.c
+++ b/src/simple-scan.c
@@ -15,7 +15,7 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
-#include <gudev/gudev.h>
+#include <gusb.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -114,10 +114,13 @@ typedef struct _ScanPageInfoClass ScanPageInfoClass;
 
 typedef struct _ScanLine ScanLine;
 typedef struct _ScanLineClass ScanLineClass;
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 typedef struct _ScanDevicePrivate ScanDevicePrivate;
 #define __g_list_free__scan_device_unref0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__scan_device_unref0_ (var), NULL)))
-#define _g_list_free0(var) ((var == NULL) ? NULL : (var = (g_list_free (var), NULL)))
 #define _g_free0(var) (var = (g_free (var), NULL))
+#define _g_list_free0(var) ((var == NULL) ? NULL : (var = (g_list_free (var), NULL)))
+#define _g_ptr_array_unref0(var) ((var == NULL) ? NULL : (var = (g_ptr_array_unref (var), NULL)))
+#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
 
 #define TYPE_PAGE (page_get_type ())
 #define PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE, Page))
@@ -131,7 +134,6 @@ typedef struct _PageClass PageClass;
 
 #define TYPE_SCAN_DIRECTION (scan_direction_get_type ())
 #define _page_unref0(var) ((var == NULL) ? NULL : (var = (page_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 typedef struct _ScanPageInfoPrivate ScanPageInfoPrivate;
 typedef struct _ScanOptionsPrivate ScanOptionsPrivate;
 
@@ -155,7 +157,7 @@ struct _SimpleScanClass {
 struct _SimpleScanPrivate {
 	ScanDevice* default_device;
 	gboolean have_devices;
-	GUdevClient* udev_client;
+	GUsbContext* usb_context;
 	UserInterface* ui;
 	Scanner* scanner;
 	Book* book;
@@ -323,9 +325,12 @@ static void simple_scan_scanner_failed_cb (SimpleScan* self, Scanner* scanner, g
 static void _simple_scan_scanner_failed_cb_scanner_scan_failed (Scanner* _sender, gint error_code, const gchar* error_string, gpointer self);
 static void simple_scan_scanner_scanning_changed_cb (SimpleScan* self, Scanner* scanner);
 static void _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed (Scanner* _sender, gpointer self);
-static void simple_scan_on_uevent (SimpleScan* self, GUdevClient* client, const gchar* action, GUdevDevice* device);
-static void _simple_scan_on_uevent_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self);
-void user_interface_set_scan_devices (UserInterface* self, GList* devices);
+static void ___lambda22_ (SimpleScan* self);
+void scanner_redetect (Scanner* self);
+static void ____lambda22__g_usb_context_device_added (GUsbContext* _sender, GUsbDevice* device, gpointer self);
+static void ___lambda23_ (SimpleScan* self);
+static void ____lambda23__g_usb_context_device_removed (GUsbContext* _sender, GUsbDevice* device, gpointer self);
+void user_interface_set_scan_devices (UserInterface* self, GList* devices, const gchar* missing_driver);
 void user_interface_set_selected_device (UserInterface* self, const gchar* value);
 static void _scan_device_unref0_ (gpointer var);
 static void _g_list_free__scan_device_unref0_ (GList* self);
@@ -334,6 +339,9 @@ void user_interface_start (UserInterface* self);
 void scanner_start (Scanner* self);
 static void simple_scan_real_shutdown (GApplication* base);
 void scanner_free (Scanner* self);
+gchar* simple_scan_suggest_driver (SimpleScan* self);
+static void _g_free0_ (gpointer var);
+static void simple_scan_add_devices (SimpleScan* self, GHashTable* map, guint32* devices, int devices_length1, const gchar* driver);
 void user_interface_authorize (UserInterface* self, const gchar* resource, gchar** username, gchar** password);
 void scanner_authorize (Scanner* self, const gchar* username, const gchar* password);
 gpointer page_ref (gpointer instance);
@@ -378,7 +386,6 @@ gboolean scanner_is_scanning (Scanner* self);
 void user_interface_set_scanning (UserInterface* self, gboolean value);
 GType scan_mode_get_type (void) G_GNUC_CONST;
 GType scan_type_get_type (void) G_GNUC_CONST;
-void user_interface_set_default_file_name (UserInterface* self, const gchar* value);
 void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options);
 void scanner_cancel (Scanner* self);
 static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar* prefix, const gchar* extension);
@@ -387,22 +394,26 @@ void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError
 void user_interface_hide_progress_dialog (UserInterface* self);
 void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError** error);
 static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message);
-void scanner_redetect (Scanner* self);
 static void simple_scan_fix_pdf (const gchar* filename, GError** error);
 gint simple_scan_main (gchar** args, int args_length1);
 ScanDevice* scan_device_new (void);
 ScanDevice* scan_device_construct (GType object_type);
 static void _simple_scan_log_cb_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self);
 static void simple_scan_finalize (GObject* obj);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 const GOptionEntry SIMPLE_SCAN_options[4] = {{"version", 'v', 0, G_OPTION_ARG_NONE, &simple_scan_show_version, "Show release version", NULL}, {"debug", 'd', 0, G_OPTION_ARG_NONE, &simple_scan_debug_enabled, "Print debugging messages", NULL}, {"fix-pdf", (gchar) 0, 0, G_OPTION_ARG_STRING, &simple_scan_fix_pdf_filename, "Fix PDF files generated with older versions of Simple Scan", "FILENAME..."}, {NULL}};
+static const guint32 SIMPLE_SCAN_brscan_devices[56] = {(guint32) 0x04f90110, (guint32) 0x04f90111, (guint32) 0x04f90112, (guint32) 0x04f9011d, (guint32) 0x04f9011e, (guint32) 0x04f9011f, (guint32) 0x04f9012b, (guint32) 0x04f90124, (guint32) 0x04f90153, (guint32) 0x04f90125, (guint32) 0x04f90113, (guint32) 0x04f90114, (guint32) 0x04f90115, (guint32) 0x04f90116, (guint32) 0x04f90119, (guint32) 0x04f9011a, (guint32) 0x04f9011b, (guint32) 0x04f9011c, (guint32) 0x04f9012e, (guint32) 0x04f9012f, (guint32) 0x04f90130, (guint32) 0x04f90128, (guint32) 0x04f90127, (guint32) 0x04f90142, (guint32) 0x04f90143, (guint32) 0x04f90140, (guint32) 0x04f90141, (guint32) 0x04f9014e, (guint32) 0x04f9014f, (guint32) 0x04f90150, (guint32) 0x04f90151, (guint32) 0x04f9010e, (guint32) 0x04f9013a, (guint32) 0x04f90120, (guint32) 0x04f9010f, (guint32) 0x04f90121, (guint32) 0x04f90122, (guint32) 0x04f90132, (guint32) 0x04f9013d, (guint32) 0x04f9013c, (guint32) 0x04f90136, (guint32) 0x04f90135, (guint32) 0x04f9013e, (guint32) 0x04f9013f, (guint32) 0x04f90144, (guint32) 0x04f90146, (guint32) 0x04f90148, (guint32) 0x04f9014a, (guint32) 0x04f9014b, (guint32) 0x04f9014c, (guint32) 0x04f90157, (guint32) 0x04f90158, (guint32) 0x04f9015d, (guint32) 0x04f9015e, (guint32) 0x04f9015f, (guint32) 0x04f90160};
+static const guint32 SIMPLE_SCAN_brscan2_devices[31] = {(guint32) 0x04f901c9, (guint32) 0x04f901ca, (guint32) 0x04f901cb, (guint32) 0x04f901cc, (guint32) 0x04f901ec, (guint32) 0x04f901e4, (guint32) 0x04f901e3, (guint32) 0x04f901e2, (guint32) 0x04f901e1, (guint32) 0x04f901e0, (guint32) 0x04f901df, (guint32) 0x04f901de, (guint32) 0x04f901dd, (guint32) 0x04f901dc, (guint32) 0x04f901db, (guint32) 0x04f901da, (guint32) 0x04f901d9, (guint32) 0x04f901d8, (guint32) 0x04f901d7, (guint32) 0x04f901d6, (guint32) 0x04f901d5, (guint32) 0x04f901d4, (guint32) 0x04f901d3, (guint32) 0x04f901d2, (guint32) 0x04f901d1, (guint32) 0x04f901d0, (guint32) 0x04f901cf, (guint32) 0x04f901ce, (guint32) 0x04f9020d, (guint32) 0x04f9020c, (guint32) 0x04f9020a};
+static const guint32 SIMPLE_SCAN_brscan3_devices[58] = {(guint32) 0x04f90222, (guint32) 0x04f90223, (guint32) 0x04f90224, (guint32) 0x04f90225, (guint32) 0x04f90229, (guint32) 0x04f9022a, (guint32) 0x04f9022c, (guint32) 0x04f90228, (guint32) 0x04f90236, (guint32) 0x04f90227, (guint32) 0x04f9022b, (guint32) 0x04f9022d, (guint32) 0x04f9022e, (guint32) 0x04f9022f, (guint32) 0x04f90230, (guint32) 0x04f9021b, (guint32) 0x04f9021a, (guint32) 0x04f90219, (guint32) 0x04f9023f, (guint32) 0x04f90216, (guint32) 0x04f9021d, (guint32) 0x04f9021c, (guint32) 0x04f90220, (guint32) 0x04f9021e, (guint32) 0x04f9023e, (guint32) 0x04f90235, (guint32) 0x04f9023a, (guint32) 0x04f901c9, (guint32) 0x04f901ca, (guint32) 0x04f901cb, (guint32) 0x04f901cc, (guint32) 0x04f901ec, (guint32) 0x04f9020d, (guint32) 0x04f9020c, (guint32) 0x04f90257, (guint32) 0x04f9025d, (guint32) 0x04f90254, (guint32) 0x04f9025b, (guint32) 0x04f9026b, (guint32) 0x04f90258, (guint32) 0x04f9025e, (guint32) 0x04f90256, (guint32) 0x04f90240, (guint32) 0x04f9025f, (guint32) 0x04f90260, (guint32) 0x04f90261, (guint32) 0x04f90278, (guint32) 0x04f9026f, (guint32) 0x04f9026e, (guint32) 0x04f9026d, (guint32) 0x04f90234, (guint32) 0x04f90239, (guint32) 0x04f90253, (guint32) 0x04f90255, (guint32) 0x04f90259, (guint32) 0x04f9025a, (guint32) 0x04f9025c, (guint32) 0x04f90276};
+static const guint32 SIMPLE_SCAN_brscan4_devices[224] = {(guint32) 0x04f90314, (guint32) 0x04f90313, (guint32) 0x04f90312, (guint32) 0x04f90311, (guint32) 0x04f90310, (guint32) 0x04f9030f, (guint32) 0x04f90366, (guint32) 0x04f90365, (guint32) 0x04f90364, (guint32) 0x04f90350, (guint32) 0x04f9034f, (guint32) 0x04f9034e, (guint32) 0x04f9034b, (guint32) 0x04f90349, (guint32) 0x04f90347, (guint32) 0x04f90346, (guint32) 0x04f90343, (guint32) 0x04f90342, (guint32) 0x04f90341, (guint32) 0x04f90340, (guint32) 0x04f9033d, (guint32) 0x04f9033c, (guint32) 0x04f9033a, (guint32) 0x04f90339, (guint32) 0x04f90392, (guint32) 0x04f90373, (guint32) 0x04f9036e, (guint32) 0x04f9036d, (guint32) 0x04f9036c, (guint32) 0x04f9036b, (guint32) 0x04f9036a, (guint32) 0x04f90369, (guint32) 0x04f90368, (guint32) 0x04f90367, (guint32) 0x04f90338, (guint32) 0x04f90337, (guint32) 0x04f90335, (guint32) 0x04f90331, (guint32) 0x04f90330, (guint32) 0x04f90329, (guint32) 0x04f90328, (guint32) 0x04f90326, (guint32) 0x04f90324, (guint32) 0x04f90322, (guint32) 0x04f90321, (guint32) 0x04f90320, (guint32) 0x04f90372, (guint32) 0x04f90371, (guint32) 0x04f90370, (guint32) 0x04f9036f, (guint32) 0x04f90361, (guint32) 0x04f90360, (guint32) 0x04f9035e, (guint32) 0x04f9035d, (guint32) 0x04f9035c, (guint32) 0x04f9035b, (guint32) 0x04f90379, (guint32) 0x04f90378, (guint32) 0x04f90376, (guint32) 0x04f9037a, (guint32) 0x04f9037b, (guint32) 0x04f90377, (guint32) 0x04f9037f, (guint32) 0x04f9037e, (guint32) 0x04f9037d, (guint32) 0x04f9037c, (guint32) 0x04f9035a, (guint32) 0x04f90359, (guint32) 0x04f90358, (guint32) 0x04f90357, (guint32) 0x04f90356, (guint32) 0x04f90355, (guint32) 0x04f90354, (guint32) 0x04f90353, (guint32) 0x04f90351, (guint32) 0x04f90390, (guint32) 0x04f903b3, (guint32) 0x04f90396, (guint32) 0x04f90395, (guint32) 0x04f90394, (guint32) 0x04f90393, (guint32) 0x04f90380, (guint32) 0x04f90381, (guint32) 0x04f903bd, (guint32) 0x04f90383, (guint32) 0x04f90397, (guint32) 0x04f90386, (guint32) 0x04f90384, (guint32) 0x04f90385, (guint32) 0x04f90388, (guint32) 0x04f90389, (guint32) 0x04f9038b, (guint32) 0x04f9038a, (guint32) 0x04f9038c, (guint32) 0x04f9038e, (guint32) 0x04f9038f, (guint32) 0x04f9038d, (guint32) 0x04f903bc, (guint32) 0x04f903bb, (guint32) 0x04f903b6, (guint32) 0x04f903b5, (guint32) 0x04f903b4, (guint32) 0x04f90290, (guint32) 0x04f9028f, (guint32) 0x04f9028d, (guint32) 0x04f9028a, (guint32) 0x04f90284, (guint32) 0x04f90283, (guint32) 0x04f90282, (guint32) 0x04f90281, (guint32) 0x04f9027e, (guint32) 0x04f9027d, (guint32) 0x04f9027c, (guint32) 0x04f9027b, (guint32) 0x04f90280, (guint32) 0x04f9027a, (guint32) 0x04f90279, (guint32) 0x04f9027f, (guint32) 0x04f90285, (guint32) 0x04f9029a, (guint32) 0x04f9029f, (guint32) 0x04f9029e, (guint32) 0x04f90289, (guint32) 0x04f90288, (guint32) 0x04f960a0, (guint32) 0x04f960a1, (guint32) 0x04f90293, (guint32) 0x04f902b7, (guint32) 0x04f90294, (guint32) 0x04f90296, (guint32) 0x04f90298, (guint32) 0x04f902ba, (guint32) 0x04f90299, (guint32) 0x04f902bb, (guint32) 0x04f902d4, (guint32) 0x04f90291, (guint32) 0x04f902ac, (guint32) 0x04f902b5, (guint32) 0x04f90292, (guint32) 0x04f902b6, (guint32) 0x04f90295, (guint32) 0x04f902b8, (guint32) 0x04f9029c, (guint32) 0x04f902cb, (guint32) 0x04f902ca, (guint32) 0x04f902a6, (guint32) 0x04f902a7, (guint32) 0x04f902ab, (guint32) 0x04f902a5, (guint32) 0x04f902a8, (guint32) 0x04f902a0, (guint32) 0x04f902c1, (guint32) 0x04f902c0, (guint32) 0x04f902bf, (guint32) 0x04f902be, (guint32) 0x04f902bd, (guint32) 0x04f902bc, (guint32) 0x04f902b2, (guint32) 0x04f90287, (guint32) 0x04f902cf, (guint32) 0x04f902ce, (guint32) 0x04f902cd, (guint32) 0x04f902c7, (guint32) 0x04f902c6, (guint32) 0x04f902c5, (guint32) 0x04f902c4, (guint32) 0x04f902b4, (guint32) 0x04f902b3, (guint32) 0x04f902c2, (guint32) 0x04f960a4, (guint32) 0x04f960a5, (guint32) 0x04f902cc, (guint32) 0x04f902c8, (guint32) 0x04f902c3, (guint32) 0x04f902d3, (guint32) 0x04f902b1, (guint32) 0x04f902b0, (guint32) 0x04f902af, (guint32) 0x04f902ae, (guint32) 0x04f902ad, (guint32) 0x04f902d1, (guint32) 0x04f902d0, (guint32) 0x04f902fb, (guint32) 0x04f902f1, (guint32) 0x04f902f0, (guint32) 0x04f902ef, (guint32) 0x04f902ed, (guint32) 0x04f902ec, (guint32) 0x04f902ee, (guint32) 0x04f902eb, (guint32) 0x04f902e9, (guint32) 0x04f902e8, (guint32) 0x04f902fa, (guint32) 0x04f902ea, (guint32) 0x04f902e6, (guint32) 0x04f902e5, (guint32) 0x04f902e4, (guint32) 0x04f902e3, (guint32) 0x04f902e2, (guint32) 0x04f902f9, (guint32) 0x04f902de, (guint32) 0x04f902e0, (guint32) 0x04f902df, (guint32) 0x04f902e1, (guint32) 0x04f902e7, (guint32) 0x04f902fc, (guint32) 0x04f902fd, (guint32) 0x04f902fe, (guint32) 0x04f902dd, (guint32) 0x04f902c9, (guint32) 0x04f902ff, (guint32) 0x04f90300, (guint32) 0x04f902f2, (guint32) 0x04f902f3, (guint32) 0x04f902f4, (guint32) 0x04f902f8, (guint32) 0x04f902f5, (guint32) 0x04f902f6, (guint32) 0x04f902f7, (guint32) 0x04f90318, (guint32) 0x04f960a6, (guint32) 0x04f960a7, (guint32) 0x04f960a8, (guint32) 0x04f960a9};
+static const guint32 SIMPLE_SCAN_samsung_devices[69] = {(guint32) 0x04e83425, (guint32) 0x04e8341c, (guint32) 0x04e8342a, (guint32) 0x04e8343d, (guint32) 0x04e83456, (guint32) 0x04e8345a, (guint32) 0x04e83427, (guint32) 0x04e8343a, (guint32) 0x04e83428, (guint32) 0x04e8343b, (guint32) 0x04e83455, (guint32) 0x04e83421, (guint32) 0x04e83439, (guint32) 0x04e83444, (guint32) 0x04e8343f, (guint32) 0x04e8344e, (guint32) 0x04e83431, (guint32) 0x04e8345c, (guint32) 0x04e8344d, (guint32) 0x04e83462, (guint32) 0x04e83464, (guint32) 0x04e83461, (guint32) 0x04e83460, (guint32) 0x04e8340e, (guint32) 0x04e83435, (guint32) 0x04e8340f, (guint32) 0x04e83441, (guint32) 0x04e8344f, (guint32) 0x04e83413, (guint32) 0x04e8341b, (guint32) 0x04e8342e, (guint32) 0x04e83426, (guint32) 0x04e8342b, (guint32) 0x04e83433, (guint32) 0x04e83440, (guint32) 0x04e83434, (guint32) 0x04e8345b, (guint32) 0x04e83457, (guint32) 0x04e8341f, (guint32) 0x04e83453, (guint32) 0x04e8344b, (guint32) 0x04e83409, (guint32) 0x04e83412, (guint32) 0x04e83419, (guint32) 0x04e8342c, (guint32) 0x04e8343c, (guint32) 0x04e83432, (guint32) 0x04e8342d, (guint32) 0x04e83430, (guint32) 0x04e8342f, (guint32) 0x04e83446, (guint32) 0x04e8341a, (guint32) 0x04e83437, (guint32) 0x04e83442, (guint32) 0x04e83466, (guint32) 0x04e8340d, (guint32) 0x04e8341d, (guint32) 0x04e83420, (guint32) 0x04e83429, (guint32) 0x04e83443, (guint32) 0x04e83438, (guint32) 0x04e8344c, (guint32) 0x04e8345d, (guint32) 0x04e83463, (guint32) 0x04e83465, (guint32) 0x04e83450, (guint32) 0x04e83468, (guint32) 0x04e83469, (guint32) 0x04e83471};
+static const guint32 SIMPLE_SCAN_hpaio_devices[520] = {(guint32) 0x03f02311, (guint32) 0x03f09711, (guint32) 0x03f01311, (guint32) 0x03f01011, (guint32) 0x03f00f11, (guint32) 0x03f01911, (guint32) 0x03f00011, (guint32) 0x03f00111, (guint32) 0x03f00611, (guint32) 0x03f00511, (guint32) 0x03f00811, (guint32) 0x03f00711, (guint32) 0x03f00211, (guint32) 0x03f00311, (guint32) 0x03f00411, (guint32) 0x03f0062a, (guint32) 0x03f04912, (guint32) 0x03f09911, (guint32) 0x03f03802, (guint32) 0x03f07a11, (guint32) 0x03f08311, (guint32) 0x03f07b11, (guint32) 0x03f0a711, (guint32) 0x03f08d11, (guint32) 0x03f08a11, (guint32) 0x03f0bb11, (guint32) 0x03f0222a, (guint32) 0x03f0322a, (guint32) 0x03f03902, (guint32) 0x03f01002, (guint32) 0x03f0242a, (guint32) 0x03f0332a, (guint32) 0x03f0122a, (guint32) 0x03f00c2a, (guint32) 0x03f0132a, (guint32) 0x03f02c2a, (guint32) 0x03f07e11, (guint32) 0x03f07811, (guint32) 0x03f08e11, (guint32) 0x03f02d2a, (guint32) 0x03f03502, (guint32) 0x03f01102, (guint32) 0x03f06112, (guint32) 0x03f06212, (guint32) 0x03f05511, (guint32) 0x03f00f2a, (guint32) 0x03f0082a, (guint32) 0x03f07311, (guint32) 0x03f07c11, (guint32) 0x03f07d11, (guint32) 0x03f01d02, (guint32) 0x03f01202, (guint32) 0x03f01e02, (guint32) 0x03f01602, (guint32) 0x03f01302, (guint32) 0x03f01702, (guint32) 0x03f0152a, (guint32) 0x03f0142a, (guint32) 0x03f09611, (guint32) 0x03f01502, (guint32) 0x03f01902, (guint32) 0x03f01f02, (guint32) 0x03f00512, (guint32) 0x03f0aa11, (guint32) 0x03f0a311, (guint32) 0x03f01312, (guint32) 0x03f01802, (guint32) 0x03f02812, (guint32) 0x03f0bf11, (guint32) 0x03f0c011, (guint32) 0x03f0342a, (guint32) 0x03f09e17, (guint32) 0x03f09f17, (guint32) 0x03f0252a, (guint32) 0x03f0a417, (guint32) 0x03f01a02, (guint32) 0x03f09e11, (guint32) 0x03f09011, (guint32) 0x03f02602, (guint32) 0x03f0272a, (guint32) 0x03f02b02, (guint32) 0x03f01812, (guint32) 0x03f0b211, (guint32) 0x03f0352a, (guint32) 0x03f02b2a, (guint32) 0x03f0362a, (guint32) 0x03f0a517, (guint32) 0x03f01b02, (guint32) 0x03f02702, (guint32) 0x03f02c02, (guint32) 0x03f0282a, (guint32) 0x03f02104, (guint32) 0x03f0432a, (guint32) 0x03f02004, (guint32) 0x03f01a2a, (guint32) 0x03f02304, (guint32) 0x03f01b2a, (guint32) 0x03f0442a, (guint32) 0x03f08904, (guint32) 0x03f0a617, (guint32) 0x03f09a17, (guint32) 0x03f0312a, (guint32) 0x03f0452a, (guint32) 0x03f01c02, (guint32) 0x03f01811, (guint32) 0x03f09d17, (guint32) 0x03f02804, (guint32) 0x03f02904, (guint32) 0x03f01511, (guint32) 0x03f01411, (guint32) 0x03f0372a, (guint32) 0x03f00d14, (guint32) 0x03f01611, (guint32) 0x03f01711, (guint32) 0x03f00f14, (guint32) 0x03f01f2a, (guint32) 0x03f00304, (guint32) 0x03f00204, (guint32) 0x03f00804, (guint32) 0x03f02902, (guint32) 0x03f00704, (guint32) 0x03f01e2a, (guint32) 0x03f00404, (guint32) 0x03f00604, (guint32) 0x03f00904, (guint32) 0x03f01512, (guint32) 0x03f01c2a, (guint32) 0x03f00104, (guint32) 0x03f01d2a, (guint32) 0x03f00004, (guint32) 0x03f02604, (guint32) 0x03f02704, (guint32) 0x03f01804, (guint32) 0x03f01504, (guint32) 0x03f01f11, (guint32) 0x03f01204, (guint32) 0x03f01604, (guint32) 0x03f01704, (guint32) 0x03f01104, (guint32) 0x03f01e11, (guint32) 0x03f01304, (guint32) 0x03f01404, (guint32) 0x03f03104, (guint32) 0x03f01004, (guint32) 0x03f03004, (guint32) 0x03f03304, (guint32) 0x03f05004, (guint32) 0x03f01712, (guint32) 0x03f02e11, (guint32) 0x03f00517, (guint32) 0x03f08811, (guint32) 0x03f01317, (guint32) 0x03f04117, (guint32) 0x03f03217, (guint32) 0x03f03e17, (guint32) 0x03f00c17, (guint32) 0x03f0b511, (guint32) 0x03f04217, (guint32) 0x03f04317, (guint32) 0x03f02b17, (guint32) 0x03f03017, (guint32) 0x03f02d17, (guint32) 0x03f02c17, (guint32) 0x03f00b2a, (guint32) 0x03f0112a, (guint32) 0x03f08911, (guint32) 0x03f07c04, (guint32) 0x03f00912, (guint32) 0x03f03011, (guint32) 0x03f0032a, (guint32) 0x03f0002a, (guint32) 0x03f0102a, (guint32) 0x03f03402, (guint32) 0x03f05617, (guint32) 0x03f05717, (guint32) 0x03f0042a, (guint32) 0x03f00f17, (guint32) 0x03f04004, (guint32) 0x03f01017, (guint32) 0x03f01e17, (guint32) 0x03f00317, (guint32) 0x03f00f12, (guint32) 0x03f02f11, (guint32) 0x03f0052a, (guint32) 0x03f04717, (guint32) 0x03f03202, (guint32) 0x03f00e2a, (guint32) 0x03f0262a, (guint32) 0x03f03302, (guint32) 0x03f00417, (guint32) 0x03f00212, (guint32) 0x03f01412, (guint32) 0x03f07804, (guint32) 0x03f03b11, (guint32) 0x03f01117, (guint32) 0x03f03f11, (guint32) 0x03f04f17, (guint32) 0x03f04e17, (guint32) 0x03f03602, (guint32) 0x03f05817, (guint32) 0x03f01d17, (guint32) 0x03f03c11, (guint32) 0x03f07904, (guint32) 0x03f04d11, (guint32) 0x03f0072a, (guint32) 0x03f01417, (guint32) 0x03f04c11, (guint32) 0x03f0c111, (guint32) 0x03f04417, (guint32) 0x03f05017, (guint32) 0x03f0022a, (guint32) 0x03f0012a, (guint32) 0x03f0092a, (guint32) 0x03f07f11, (guint32) 0x03f04811, (guint32) 0x03f03a17, (guint32) 0x03f00a2a, (guint32) 0x03f00312, (guint32) 0x03f09411, (guint32) 0x03f09b11, (guint32) 0x03f03917, (guint32) 0x03f04a17, (guint32) 0x03f03817, (guint32) 0x03f0b911, (guint32) 0x03f05417, (guint32) 0x03f05217, (guint32) 0x03f05317, (guint32) 0x03f05d17, (guint32) 0x03f08711, (guint32) 0x03f05c17, (guint32) 0x03f09a11, (guint32) 0x03f02811, (guint32) 0x03f07d04, (guint32) 0x03f02a11, (guint32) 0x03f02b11, (guint32) 0x03f00217, (guint32) 0x03f02911, (guint32) 0x03f02404, (guint32) 0x03f03511, (guint32) 0x03f00812, (guint32) 0x03f00b17, (guint32) 0x03f0c302, (guint32) 0x03f05917, (guint32) 0x03f05a17, (guint32) 0x03f05b17, (guint32) 0x03f04911, (guint32) 0x03f03611, (guint32) 0x03f07611, (guint32) 0x03f07a04, (guint32) 0x03f02517, (guint32) 0x03f02917, (guint32) 0x03f02a17, (guint32) 0x03f01e04, (guint32) 0x03f00717, (guint32) 0x03f02504, (guint32) 0x03f03711, (guint32) 0x03f0ac11, (guint32) 0x03f0be11, (guint32) 0x03f0c211, (guint32) 0x03f01c17, (guint32) 0x03f04e11, (guint32) 0x03f02e17, (guint32) 0x03f04511, (guint32) 0x03f08011, (guint32) 0x03f00412, (guint32) 0x03f03617, (guint32) 0x03f02f17, (guint32) 0x03f03117, (guint32) 0x03f0c911, (guint32) 0x03f0ca11, (guint32) 0x03f04611, (guint32) 0x03f03c17, (guint32) 0x03f03717, (guint32) 0x03f02617, (guint32) 0x03f01112, (guint32) 0x03f00612, (guint32) 0x03f06717, (guint32) 0x03f09511, (guint32) 0x03f07617, (guint32) 0x03f07317, (guint32) 0x03f08d17, (guint32) 0x03f01617, (guint32) 0x03f07a17, (guint32) 0x03f07517, (guint32) 0x03f09311, (guint32) 0x03f0a011, (guint32) 0x03f03317, (guint32) 0x03f03417, (guint32) 0x03f0a211, (guint32) 0x03f05611, (guint32) 0x03f05011, (guint32) 0x03f00117, (guint32) 0x03f05111, (guint32) 0x03f00817, (guint32) 0x03f05211, (guint32) 0x03f07004, (guint32) 0x03f00917, (guint32) 0x03f01917, (guint32) 0x03f03517, (guint32) 0x03f07104, (guint32) 0x03f01517, (guint32) 0x03f03112, (guint32) 0x03f07817, (guint32) 0x03f0ad11, (guint32) 0x03f0b011, (guint32) 0x03f08517, (guint32) 0x03f08a17, (guint32) 0x03f0c711, (guint32) 0x03f06117, (guint32) 0x03f06917, (guint32) 0x03f06812, (guint32) 0x03f06d12, (guint32) 0x03f07204, (guint32) 0x03f00a17, (guint32) 0x03f07404, (guint32) 0x03f06817, (guint32) 0x03f01b04, (guint32) 0x03f01a04, (guint32) 0x03f01c04, (guint32) 0x03f01904, (guint32) 0x03f07504, (guint32) 0x03f07604, (guint32) 0x03f00714, (guint32) 0x03f09c11, (guint32) 0x03f07b17, (guint32) 0x03f08817, (guint32) 0x03f05711, (guint32) 0x03f07704, (guint32) 0x03f07e04, (guint32) 0x03f03111, (guint32) 0x03f06017, (guint32) 0x03f03d11, (guint32) 0x03f05c11, (guint32) 0x03f07b04, (guint32) 0x03f06a17, (guint32) 0x03f02417, (guint32) 0x03f05411, (guint32) 0x03f01f04, (guint32) 0x03f06711, (guint32) 0x03f07417, (guint32) 0x03f09717, (guint32) 0x03f02317, (guint32) 0x03f06611, (guint32) 0x03f06c11, (guint32) 0x03f09d11, (guint32) 0x03f07711, (guint32) 0x03f04712, (guint32) 0x03f08c11, (guint32) 0x03f05712, (guint32) 0x03f02a12, (guint32) 0x03f06b11, (guint32) 0x03f0c511, (guint32) 0x03f02e12, (guint32) 0x03f0c411, (guint32) 0x03f09917, (guint32) 0x03f09c17, (guint32) 0x03f07411, (guint32) 0x03f06c17, (guint32) 0x03f05812, (guint32) 0x03f06512, (guint32) 0x03f06612, (guint32) 0x03f06412, (guint32) 0x03f0c611, (guint32) 0x03f0c811, (guint32) 0x03f01a17, (guint32) 0x03f02b12, (guint32) 0x03f02c12, (guint32) 0x03f07511, (guint32) 0x03f06217, (guint32) 0x03f07d17, (guint32) 0x03f06317, (guint32) 0x03f07917, (guint32) 0x03f07217, (guint32) 0x03f0a117, (guint32) 0x03f0c802, (guint32) 0x03f05811, (guint32) 0x03f0c402, (guint32) 0x03f02411, (guint32) 0x03f05d11, (guint32) 0x03f06417, (guint32) 0x03f06617, (guint32) 0x03f08917, (guint32) 0x03f05117, (guint32) 0x03f07111, (guint32) 0x03f01f12, (guint32) 0x03f06811, (guint32) 0x03f02012, (guint32) 0x03f08604, (guint32) 0x03f06d11, (guint32) 0x03f03a11, (guint32) 0x03f03012, (guint32) 0x03f08211, (guint32) 0x03f07211, (guint32) 0x03f0a111, (guint32) 0x03f0b411, (guint32) 0x03f09b17, (guint32) 0x03f0b111, (guint32) 0x03f0b611, (guint32) 0x03f0c311, (guint32) 0x03f01f17, (guint32) 0x03f06004, (guint32) 0x03f04f11, (guint32) 0x03f0cc11, (guint32) 0x03f06104, (guint32) 0x03f05b11, (guint32) 0x03f08104, (guint32) 0x03f0cd11, (guint32) 0x03f0a004, (guint32) 0x03f08704, (guint32) 0x03f04312, (guint32) 0x03f04212, (guint32) 0x03f06f17, (guint32) 0x03f07c17, (guint32) 0x03f09517, (guint32) 0x03f05911, (guint32) 0x03f05e12, (guint32) 0x03f00b14, (guint32) 0x03f0c502, (guint32) 0x03f02d11, (guint32) 0x03f03404, (guint32) 0x03f04b11, (guint32) 0x03f01014, (guint32) 0x03f06a11, (guint32) 0x03f07312, (guint32) 0x03f07011, (guint32) 0x03f05311, (guint32) 0x03f03312, (guint32) 0x03f04412, (guint32) 0x03f05412, (guint32) 0x03f05512, (guint32) 0x03f04512, (guint32) 0x03f08204, (guint32) 0x03f0a511, (guint32) 0x03f0af11, (guint32) 0x03f0ba11, (guint32) 0x03f08504, (guint32) 0x03f05d12, (guint32) 0x03f05c12, (guint32) 0x03f08404, (guint32) 0x03f07412, (guint32) 0x03f07212, (guint32) 0x03f08804, (guint32) 0x03f04612, (guint32) 0x03f02611, (guint32) 0x03f05a11, (guint32) 0x03f02612, (guint32) 0x03f0c602, (guint32) 0x03f06012, (guint32) 0x03f03a02, (guint32) 0x03f06911, (guint32) 0x03f0b002, (guint32) 0x03f04111, (guint32) 0x03f06511, (guint32) 0x03f04211, (guint32) 0x03f02512, (guint32) 0x03f0c702, (guint32) 0x03f02002, (guint32) 0x03f03c02, (guint32) 0x03f04311, (guint32) 0x03f0b802, (guint32) 0x03f05e11, (guint32) 0x03f03412, (guint32) 0x03f02112, (guint32) 0x03f04812, (guint32) 0x03f06f11, (guint32) 0x03f0a611, (guint32) 0x03f0bc11, (guint32) 0x03f03e02, (guint32) 0x03f02212, (guint32) 0x03f0b202, (guint32) 0x03f06e12, (guint32) 0x03f0dc11, (guint32) 0x03f02312, (guint32) 0x03f0b402, (guint32) 0x03f0c002, (guint32) 0x03f0b602, (guint32) 0x03f05612, (guint32) 0x03f03612, (guint32) 0x03f0c102, (guint32) 0x03f0de11, (guint32) 0x03f07717, (guint32) 0x03f07117, (guint32) 0x03f05b12, (guint32) 0x03f06411, (guint32) 0x03f0ba02, (guint32) 0x03f0c202, (guint32) 0x03f0be02, (guint32) 0x03f0bb02, (guint32) 0x03f03812, (guint32) 0x03f04012, (guint32) 0x03f03912, (guint32) 0x03f0d102, (guint32) 0x03f05312, (guint32) 0x03f02712, (guint32) 0x03f05912, (guint32) 0x03f07112, (guint32) 0x03f07012, (guint32) 0x03f06f12, (guint32) 0x03f07712, (guint32) 0x03f07612, (guint32) 0x03f0bc02, (guint32) 0x03f0d002, (guint32) 0x03f08417, (guint32) 0x03f02017, (guint32) 0x03f02117, (guint32) 0x03f08317, (guint32) 0x03f09617, (guint32) 0x03f00d12, (guint32) 0x03f0bd02, (guint32) 0x03f02217, (guint32) 0x03f00b12, (guint32) 0x03f01212, (guint32) 0x03f03c2a, (guint32) 0x03f0382a, (guint32) 0x03f0582a, (guint32) 0x03f0552a, (guint32) 0x03f03e2a, (guint32) 0x03f03f2a, (guint32) 0x03f0e311, (guint32) 0x03f0e111};
+static const guint32 SIMPLE_SCAN_epkowa_devices[201] = {(guint32) 0x04b80101, (guint32) 0x04b80102, (guint32) 0x04b80103, (guint32) 0x04b80104, (guint32) 0x04b80105, (guint32) 0x04b80106, (guint32) 0x04b80107, (guint32) 0x04b80108, (guint32) 0x04b80109, (guint32) 0x04b8010a, (guint32) 0x04b8010b, (guint32) 0x04b8010c, (guint32) 0x04b8010d, (guint32) 0x04b8010e, (guint32) 0x04b8010f, (guint32) 0x04b80110, (guint32) 0x04b80112, (guint32) 0x04b80114, (guint32) 0x04b80116, (guint32) 0x04b80118, (guint32) 0x04b80119, (guint32) 0x04b8011a, (guint32) 0x04b8011b, (guint32) 0x04b8011c, (guint32) 0x04b8011d, (guint32) 0x04b8011e, (guint32) 0x04b8011f, (guint32) 0x04b80120, (guint32) 0x04b80121, (guint32) 0x04b80122, (guint32) 0x04b80126, (guint32) 0x04b80128, (guint32) 0x04b80129, (guint32) 0x04b8012a, (guint32) 0x04b8012b, (guint32) 0x04b8012c, (guint32) 0x04b8012d, (guint32) 0x04b8012e, (guint32) 0x04b8012f, (guint32) 0x04b80130, (guint32) 0x04b80131, (guint32) 0x04b80133, (guint32) 0x04b80135, (guint32) 0x04b80136, (guint32) 0x04b80137, (guint32) 0x04b80138, (guint32) 0x04b8013a, (guint32) 0x04b8013b, (guint32) 0x04b8013c, (guint32) 0x04b8013d, (guint32) 0x04b80142, (guint32) 0x04b80143, (guint32) 0x04b80144, (guint32) 0x04b80147, (guint32) 0x04b8014a, (guint32) 0x04b8014b, (guint32) 0x04b80151, (guint32) 0x04b80153, (guint32) 0x04b80801, (guint32) 0x04b80802, (guint32) 0x04b80805, (guint32) 0x04b80806, (guint32) 0x04b80807, (guint32) 0x04b80808, (guint32) 0x04b8080a, (guint32) 0x04b8080c, (guint32) 0x04b8080d, (guint32) 0x04b8080e, (guint32) 0x04b8080f, (guint32) 0x04b80810, (guint32) 0x04b80811, (guint32) 0x04b80813, (guint32) 0x04b80814, (guint32) 0x04b80815, (guint32) 0x04b80817, (guint32) 0x04b80818, (guint32) 0x04b80819, (guint32) 0x04b8081a, (guint32) 0x04b8081c, (guint32) 0x04b8081d, (guint32) 0x04b8081f, (guint32) 0x04b80820, (guint32) 0x04b80821, (guint32) 0x04b80827, (guint32) 0x04b80828, (guint32) 0x04b80829, (guint32) 0x04b8082a, (guint32) 0x04b8082b, (guint32) 0x04b8082e, (guint32) 0x04b8082f, (guint32) 0x04b80830, (guint32) 0x04b80831, (guint32) 0x04b80833, (guint32) 0x04b80834, (guint32) 0x04b80835, (guint32) 0x04b80836, (guint32) 0x04b80837, (guint32) 0x04b80838, (guint32) 0x04b80839, (guint32) 0x04b8083a, (guint32) 0x04b8083c, (guint32) 0x04b8083f, (guint32) 0x04b80841, (guint32) 0x04b80843, (guint32) 0x04b80844, (guint32) 0x04b80846, (guint32) 0x04b80847, (guint32) 0x04b80848, (guint32) 0x04b80849, (guint32) 0x04b8084a, (guint32) 0x04b8084c, (guint32) 0x04b8084d, (guint32) 0x04b8084f, (guint32) 0x04b80850, (guint32) 0x04b80851, (guint32) 0x04b80852, (guint32) 0x04b80853, (guint32) 0x04b80854, (guint32) 0x04b80855, (guint32) 0x04b80856, (guint32) 0x04b8085c, (guint32) 0x04b8085d, (guint32) 0x04b8085e, (guint32) 0x04b8085f, (guint32) 0x04b80860, (guint32) 0x04b80861, (guint32) 0x04b80862, (guint32) 0x04b80863, (guint32) 0x04b80864, (guint32) 0x04b80865, (guint32) 0x04b80866, (guint32) 0x04b80869, (guint32) 0x04b8086a, (guint32) 0x04b80870, (guint32) 0x04b80871, (guint32) 0x04b80872, (guint32) 0x04b80873, (guint32) 0x04b80878, (guint32) 0x04b80879, (guint32) 0x04b8087b, (guint32) 0x04b8087c, (guint32) 0x04b8087d, (guint32) 0x04b8087e, (guint32) 0x04b8087f, (guint32) 0x04b80880, (guint32) 0x04b80881, (guint32) 0x04b80883, (guint32) 0x04b80884, (guint32) 0x04b80885, (guint32) 0x04b8088f, (guint32) 0x04b80890, (guint32) 0x04b80891, (guint32) 0x04b80892, (guint32) 0x04b80893, (guint32) 0x04b80894, (guint32) 0x04b80895, (guint32) 0x04b80896, (guint32) 0x04b80897, (guint32) 0x04b80898, (guint32) 0x04b80899, (guint32) 0x04b8089a, (guint32) 0x04b8089b, (guint32) 0x04b8089c, (guint32) 0x04b8089d, (guint32) 0x04b8089e, (guint32) 0x04b8089f, (guint32) 0x04b808a0, (guint32) 0x04b808a1, (guint32) 0x04b808a5, (guint32) 0x04b808a6, (guint32) 0x04b808a8, (guint32) 0x04b808a9, (guint32) 0x04b808aa, (guint32) 0x04b808ab, (guint32) 0x04b808ac, (guint32) 0x04b808ad, (guint32) 0x04b808ae, (guint32) 0x04b808af, (guint32) 0x04b808b0, (guint32) 0x04b808b3, (guint32) 0x04b808b4, (guint32) 0x04b808b5, (guint32) 0x04b808b6, (guint32) 0x04b808b7, (guint32) 0x04b808b8, (guint32) 0x04b808b9, (guint32) 0x04b808bd, (guint32) 0x04b808be, (guint32) 0x04b808bf, (guint32) 0x04b808c0, (guint32) 0x04b808c1, (guint32) 0x04b808c3, (guint32) 0x04b808c4, (guint32) 0x04b808c5, (guint32) 0x04b808c6, (guint32) 0x04b808c7, (guint32) 0x04b808c8, (guint32) 0x04b808c9, (guint32) 0x04b808ca, (guint32) 0x04b808cd, (guint32) 0x04b808d0};
 
 static gpointer _scan_device_ref0 (gpointer self) {
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return self ? scan_device_ref (self) : NULL;
-#line 406 "simple-scan.c"
+#line 417 "simple-scan.c"
 }
 
 
@@ -422,128 +433,155 @@ SimpleScan* simple_scan_construct (GType object_type, ScanDevice* device) {
 	self->priv->default_device = _tmp1_;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return self;
-#line 426 "simple-scan.c"
+#line 437 "simple-scan.c"
 }
 
 
 SimpleScan* simple_scan_new (ScanDevice* device) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return simple_scan_construct (TYPE_SIMPLE_SCAN, device);
-#line 433 "simple-scan.c"
+#line 444 "simple-scan.c"
 }
 
 
 static gpointer _book_ref0 (gpointer self) {
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return self ? book_ref (self) : NULL;
-#line 440 "simple-scan.c"
+#line 451 "simple-scan.c"
 }
 
 
 static void _simple_scan_scan_cb_user_interface_start_scan (UserInterface* _sender, const gchar* device, ScanOptions* options, gpointer self) {
 #line 50 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scan_cb ((SimpleScan*) self, _sender, device, options);
-#line 447 "simple-scan.c"
+#line 458 "simple-scan.c"
 }
 
 
 static void _simple_scan_cancel_cb_user_interface_stop_scan (UserInterface* _sender, gpointer self) {
 #line 51 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_cancel_cb ((SimpleScan*) self, _sender);
-#line 454 "simple-scan.c"
+#line 465 "simple-scan.c"
 }
 
 
 static void _simple_scan_email_cb_user_interface_email (UserInterface* _sender, const gchar* profile, gint quality, gpointer self) {
 #line 52 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_email_cb ((SimpleScan*) self, _sender, profile, quality);
-#line 461 "simple-scan.c"
+#line 472 "simple-scan.c"
 }
 
 
 static void _simple_scan_update_scan_devices_cb_scanner_update_devices (Scanner* _sender, GList* devices, gpointer self) {
 #line 55 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_update_scan_devices_cb ((SimpleScan*) self, _sender, devices);
-#line 468 "simple-scan.c"
+#line 479 "simple-scan.c"
 }
 
 
 static void _simple_scan_authorize_cb_scanner_request_authorization (Scanner* _sender, const gchar* resource, gpointer self) {
 #line 56 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_authorize_cb ((SimpleScan*) self, _sender, resource);
-#line 475 "simple-scan.c"
+#line 486 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_new_page_cb_scanner_expect_page (Scanner* _sender, gpointer self) {
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_new_page_cb ((SimpleScan*) self, _sender);
-#line 482 "simple-scan.c"
+#line 493 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_page_info_cb_scanner_got_page_info (Scanner* _sender, ScanPageInfo* info, gpointer self) {
 #line 58 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_page_info_cb ((SimpleScan*) self, _sender, info);
-#line 489 "simple-scan.c"
+#line 500 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_line_cb_scanner_got_line (Scanner* _sender, ScanLine* line, gpointer self) {
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_line_cb ((SimpleScan*) self, _sender, line);
-#line 496 "simple-scan.c"
+#line 507 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_page_done_cb_scanner_page_done (Scanner* _sender, gpointer self) {
 #line 60 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_page_done_cb ((SimpleScan*) self, _sender);
-#line 503 "simple-scan.c"
+#line 514 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_document_done_cb_scanner_document_done (Scanner* _sender, gpointer self) {
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_document_done_cb ((SimpleScan*) self, _sender);
-#line 510 "simple-scan.c"
+#line 521 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_failed_cb_scanner_scan_failed (Scanner* _sender, gint error_code, const gchar* error_string, gpointer self) {
 #line 62 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_failed_cb ((SimpleScan*) self, _sender, error_code, error_string);
-#line 517 "simple-scan.c"
+#line 528 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed (Scanner* _sender, gpointer self) {
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_scanning_changed_cb ((SimpleScan*) self, _sender);
-#line 524 "simple-scan.c"
+#line 535 "simple-scan.c"
 }
 
 
-static void _simple_scan_on_uevent_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self) {
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_on_uevent ((SimpleScan*) self, _sender, action, device);
-#line 531 "simple-scan.c"
+static void ___lambda22_ (SimpleScan* self) {
+	Scanner* _tmp0_ = NULL;
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp0_ = self->priv->scanner;
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	scanner_redetect (_tmp0_);
+#line 545 "simple-scan.c"
 }
 
 
-static void _scan_device_unref0_ (gpointer var) {
+static void ____lambda22__g_usb_context_device_added (GUsbContext* _sender, GUsbDevice* device, gpointer self) {
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	___lambda22_ ((SimpleScan*) self);
+#line 552 "simple-scan.c"
+}
+
+
+static void ___lambda23_ (SimpleScan* self) {
+	Scanner* _tmp0_ = NULL;
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp0_ = self->priv->scanner;
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	scanner_redetect (_tmp0_);
+#line 562 "simple-scan.c"
+}
+
+
+static void ____lambda23__g_usb_context_device_removed (GUsbContext* _sender, GUsbDevice* device, gpointer self) {
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	___lambda23_ ((SimpleScan*) self);
+#line 569 "simple-scan.c"
+}
+
+
+static void _scan_device_unref0_ (gpointer var) {
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	(var == NULL) ? NULL : (var = (scan_device_unref (var), NULL));
-#line 538 "simple-scan.c"
+#line 576 "simple-scan.c"
 }
 
 
 static void _g_list_free__scan_device_unref0_ (GList* self) {
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_list_foreach (self, (GFunc) _scan_device_unref0_, NULL);
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_list_free (self);
-#line 547 "simple-scan.c"
+#line 585 "simple-scan.c"
 }
 
 
@@ -567,16 +605,8 @@ static void simple_scan_real_startup (GApplication* base) {
 	Scanner* _tmp15_ = NULL;
 	Scanner* _tmp16_ = NULL;
 	Scanner* _tmp17_ = NULL;
-	gchar** subsystems = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar** _tmp19_ = NULL;
-	gint subsystems_length1 = 0;
-	gint _subsystems_size_ = 0;
-	gchar** _tmp20_ = NULL;
-	gint _tmp20__length1 = 0;
-	GUdevClient* _tmp21_ = NULL;
-	GUdevClient* _tmp22_ = NULL;
-	ScanDevice* _tmp23_ = NULL;
+	ScanDevice* _tmp25_ = NULL;
+	GError * _inner_error_ = NULL;
 #line 44 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self = (SimpleScan*) base;
 #line 46 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -655,76 +685,112 @@ static void simple_scan_real_startup (GApplication* base) {
 	_tmp17_ = self->priv->scanner;
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp17_, "scanning-changed", (GCallback) _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed, self, 0);
+#line 689 "simple-scan.c"
+	{
+		GUsbContext* _tmp18_ = NULL;
+		GUsbContext* _tmp19_ = NULL;
+		GUsbContext* _tmp20_ = NULL;
+		GUsbContext* _tmp21_ = NULL;
+		GUsbContext* _tmp22_ = NULL;
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp19_ = g_usb_context_new (&_inner_error_);
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp18_ = _tmp19_;
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 702 "simple-scan.c"
+			goto __catch4_g_error;
+		}
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp20_ = _tmp18_;
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp18_ = NULL;
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_g_object_unref0 (self->priv->usb_context);
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		self->priv->usb_context = _tmp20_;
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp21_ = self->priv->usb_context;
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_signal_connect_object (_tmp21_, "device-added", (GCallback) ____lambda22__g_usb_context_device_added, self, 0);
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp22_ = self->priv->usb_context;
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_signal_connect_object (_tmp22_, "device-removed", (GCallback) ____lambda23__g_usb_context_device_removed, self, 0);
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp18_ = g_strdup ("usb");
+		_g_object_unref0 (_tmp18_);
+#line 723 "simple-scan.c"
+	}
+	goto __finally4;
+	__catch4_g_error:
+	{
+		GError* e = NULL;
+		GError* _tmp23_ = NULL;
+		const gchar* _tmp24_ = NULL;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp19_ = g_new0 (gchar*, 2 + 1);
+		e = _inner_error_;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp19_[0] = _tmp18_;
+		_inner_error_ = NULL;
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp23_ = e;
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp24_ = _tmp23_->message;
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_warning ("simple-scan.vala:73: Failed to create USB context: %s\n", _tmp24_);
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp19_[1] = NULL;
+		_g_error_free0 (e);
+#line 743 "simple-scan.c"
+	}
+	__finally4:
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	subsystems = _tmp19_;
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	subsystems_length1 = 2;
+		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 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_subsystems_size_ = subsystems_length1;
-#line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp20_ = subsystems;
-#line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp20__length1 = subsystems_length1;
-#line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp21_ = g_udev_client_new (_tmp20_);
-#line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_object_unref0 (self->priv->udev_client);
-#line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	self->priv->udev_client = _tmp21_;
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp22_ = self->priv->udev_client;
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_signal_connect_object (_tmp22_, "uevent", (GCallback) _simple_scan_on_uevent_g_udev_client_uevent, self, 0);
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp23_ = self->priv->default_device;
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp23_ != NULL) {
-#line 691 "simple-scan.c"
+		g_clear_error (&_inner_error_);
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		return;
+#line 754 "simple-scan.c"
+	}
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp25_ = self->priv->default_device;
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	if (_tmp25_ != NULL) {
+#line 760 "simple-scan.c"
 		GList* device_list = NULL;
-		ScanDevice* _tmp24_ = NULL;
-		ScanDevice* _tmp25_ = NULL;
-		UserInterface* _tmp26_ = NULL;
-		GList* _tmp27_ = NULL;
+		ScanDevice* _tmp26_ = NULL;
+		ScanDevice* _tmp27_ = NULL;
 		UserInterface* _tmp28_ = NULL;
-		ScanDevice* _tmp29_ = NULL;
-		const gchar* _tmp30_ = NULL;
-#line 71 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		GList* _tmp29_ = NULL;
+		UserInterface* _tmp30_ = NULL;
+		ScanDevice* _tmp31_ = NULL;
+		const gchar* _tmp32_ = NULL;
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		device_list = NULL;
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp24_ = self->priv->default_device;
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp25_ = _scan_device_ref0 (_tmp24_);
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		device_list = g_list_append (device_list, _tmp25_);
-#line 74 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp26_ = self->priv->ui;
-#line 74 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp27_ = device_list;
-#line 74 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		user_interface_set_scan_devices (_tmp26_, _tmp27_);
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp26_ = self->priv->default_device;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp27_ = _scan_device_ref0 (_tmp26_);
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		device_list = g_list_append (device_list, _tmp27_);
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp28_ = self->priv->ui;
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp29_ = self->priv->default_device;
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp30_ = _tmp29_->name;
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		user_interface_set_selected_device (_tmp28_, _tmp30_);
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp29_ = device_list;
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		user_interface_set_scan_devices (_tmp28_, _tmp29_, NULL);
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp30_ = self->priv->ui;
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp31_ = self->priv->default_device;
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp32_ = _tmp31_->name;
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		user_interface_set_selected_device (_tmp30_, _tmp32_);
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		__g_list_free__scan_device_unref0_0 (device_list);
-#line 724 "simple-scan.c"
+#line 793 "simple-scan.c"
 	}
-#line 44 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	subsystems = (_vala_array_free (subsystems, subsystems_length1, (GDestroyNotify) g_free), NULL);
-#line 728 "simple-scan.c"
 }
 
 
@@ -732,46 +798,46 @@ static void simple_scan_real_activate (GApplication* base) {
 	SimpleScan * self;
 	UserInterface* _tmp0_ = NULL;
 	Scanner* _tmp1_ = NULL;
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self = (SimpleScan*) base;
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_APPLICATION_CLASS (simple_scan_parent_class)->activate ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_get_type (), GtkApplication));
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->ui;
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	user_interface_start (_tmp0_);
-#line 83 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = self->priv->scanner;
-#line 83 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_start (_tmp1_);
-#line 748 "simple-scan.c"
+#line 814 "simple-scan.c"
 }
 
 
 static void simple_scan_real_shutdown (GApplication* base) {
 	SimpleScan * self;
 	Scanner* _tmp0_ = NULL;
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self = (SimpleScan*) base;
-#line 88 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_APPLICATION_CLASS (simple_scan_parent_class)->shutdown ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_get_type (), GtkApplication));
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_book_unref0 (self->priv->book);
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->book = NULL;
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (self->priv->ui);
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->ui = NULL;
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_object_unref0 (self->priv->udev_client);
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	self->priv->udev_client = NULL;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_g_object_unref0 (self->priv->usb_context);
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	self->priv->usb_context = NULL;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->scanner;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_free (_tmp0_);
-#line 775 "simple-scan.c"
+#line 841 "simple-scan.c"
 }
 
 
@@ -782,95 +848,432 @@ static void simple_scan_update_scan_devices_cb (SimpleScan* self, Scanner* scann
 	ScanDevice* _tmp2_ = NULL;
 	GList* _tmp10_ = NULL;
 	guint _tmp11_ = 0U;
-	UserInterface* _tmp12_ = NULL;
-	GList* _tmp13_ = NULL;
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	gchar* missing_driver = NULL;
+	gboolean _tmp12_ = FALSE;
+	UserInterface* _tmp14_ = NULL;
+	GList* _tmp15_ = NULL;
+	const gchar* _tmp16_ = NULL;
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = devices;
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = g_list_copy (_tmp0_);
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	devices_copy = _tmp1_;
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = self->priv->default_device;
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp2_ != NULL) {
-#line 802 "simple-scan.c"
+#line 871 "simple-scan.c"
 		gboolean default_in_list = FALSE;
 		GList* _tmp3_ = NULL;
 		gboolean _tmp8_ = FALSE;
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		default_in_list = FALSE;
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp3_ = devices_copy;
-#line 810 "simple-scan.c"
+#line 879 "simple-scan.c"
 		{
 			GList* device_collection = NULL;
 			GList* device_it = NULL;
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			device_collection = _tmp3_;
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
-#line 818 "simple-scan.c"
+#line 887 "simple-scan.c"
 				ScanDevice* device = NULL;
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				device = (ScanDevice*) device_it->data;
-#line 822 "simple-scan.c"
+#line 891 "simple-scan.c"
 				{
 					ScanDevice* _tmp4_ = NULL;
 					const gchar* _tmp5_ = NULL;
 					ScanDevice* _tmp6_ = NULL;
 					const gchar* _tmp7_ = NULL;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp4_ = device;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp5_ = _tmp4_->name;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp6_ = self->priv->default_device;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp7_ = _tmp6_->name;
-#line 105 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (g_strcmp0 (_tmp5_, _tmp7_) == 0) {
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						default_in_list = TRUE;
-#line 108 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
-#line 842 "simple-scan.c"
+#line 911 "simple-scan.c"
 					}
 				}
 			}
 		}
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = default_in_list;
-#line 112 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (!_tmp8_) {
-#line 851 "simple-scan.c"
+#line 920 "simple-scan.c"
 			ScanDevice* _tmp9_ = NULL;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp9_ = self->priv->default_device;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			devices_copy = g_list_prepend (devices_copy, _tmp9_);
-#line 857 "simple-scan.c"
+#line 926 "simple-scan.c"
 		}
 	}
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp10_ = devices_copy;
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp11_ = g_list_length (_tmp10_);
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->have_devices = _tmp11_ > ((guint) 0);
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp12_ = self->priv->ui;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp13_ = devices_copy;
-#line 117 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	user_interface_set_scan_devices (_tmp12_, _tmp13_);
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	missing_driver = NULL;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp12_ = self->priv->have_devices;
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	if (!_tmp12_) {
+#line 941 "simple-scan.c"
+		gchar* _tmp13_ = NULL;
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp13_ = simple_scan_suggest_driver (self);
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_g_free0 (missing_driver);
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		missing_driver = _tmp13_;
+#line 949 "simple-scan.c"
+	}
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp14_ = self->priv->ui;
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp15_ = devices_copy;
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp16_ = missing_driver;
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	user_interface_set_scan_devices (_tmp14_, _tmp15_, _tmp16_);
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_g_free0 (missing_driver);
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_list_free0 (devices_copy);
-#line 874 "simple-scan.c"
+#line 963 "simple-scan.c"
+}
+
+
+static void _g_free0_ (gpointer var) {
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	var = (g_free (var), NULL);
+#line 970 "simple-scan.c"
+}
+
+
+static gint g_ptr_array_get_length (GPtrArray* self) {
+	gint result;
+	guint _tmp0_ = 0U;
+#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, 0);
+#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	_tmp0_ = self->len;
+#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	result = (gint) _tmp0_;
+#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	return result;
+#line 985 "simple-scan.c"
+}
+
+
+static void g_ptr_array_set_length (GPtrArray* self, gint value) {
+	gint _tmp0_ = 0;
+#line 4429 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	g_return_if_fail (self != NULL);
+#line 4429 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	_tmp0_ = value;
+#line 4429 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	g_ptr_array_set_size (self, _tmp0_);
+#line 997 "simple-scan.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 1004 "simple-scan.c"
+}
+
+
+gchar* simple_scan_suggest_driver (SimpleScan* self) {
+	gchar* result = NULL;
+	GUsbContext* _tmp0_ = NULL;
+	GHashTable* driver_map = NULL;
+	GHashFunc _tmp1_ = NULL;
+	GEqualFunc _tmp2_ = NULL;
+	GHashTable* _tmp3_ = NULL;
+	GHashTable* _tmp4_ = NULL;
+	GHashTable* _tmp5_ = NULL;
+	GHashTable* _tmp6_ = NULL;
+	GHashTable* _tmp7_ = NULL;
+	GHashTable* _tmp8_ = NULL;
+	GHashTable* _tmp9_ = NULL;
+	GHashTable* _tmp10_ = NULL;
+	GPtrArray* devices = NULL;
+	GUsbContext* _tmp11_ = NULL;
+	GPtrArray* _tmp12_ = NULL;
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp0_ = self->priv->usb_context;
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	if (_tmp0_ == NULL) {
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		result = NULL;
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		return result;
+#line 1035 "simple-scan.c"
+	}
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp1_ = g_direct_hash;
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp2_ = g_direct_equal;
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp3_ = g_hash_table_new_full (_tmp1_, _tmp2_, NULL, _g_free0_);
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	driver_map = _tmp3_;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp4_ = driver_map;
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	simple_scan_add_devices (self, _tmp4_, SIMPLE_SCAN_brscan_devices, G_N_ELEMENTS (SIMPLE_SCAN_brscan_devices), "brscan");
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp5_ = driver_map;
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	simple_scan_add_devices (self, _tmp5_, SIMPLE_SCAN_brscan2_devices, G_N_ELEMENTS (SIMPLE_SCAN_brscan2_devices), "brscan2");
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp6_ = driver_map;
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	simple_scan_add_devices (self, _tmp6_, SIMPLE_SCAN_brscan3_devices, G_N_ELEMENTS (SIMPLE_SCAN_brscan3_devices), "brscan3");
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp7_ = driver_map;
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	simple_scan_add_devices (self, _tmp7_, SIMPLE_SCAN_brscan4_devices, G_N_ELEMENTS (SIMPLE_SCAN_brscan4_devices), "brscan4");
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp8_ = driver_map;
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	simple_scan_add_devices (self, _tmp8_, SIMPLE_SCAN_samsung_devices, G_N_ELEMENTS (SIMPLE_SCAN_samsung_devices), "samsung");
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp9_ = driver_map;
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	simple_scan_add_devices (self, _tmp9_, SIMPLE_SCAN_hpaio_devices, G_N_ELEMENTS (SIMPLE_SCAN_hpaio_devices), "hpaio");
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp10_ = driver_map;
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	simple_scan_add_devices (self, _tmp10_, SIMPLE_SCAN_epkowa_devices, G_N_ELEMENTS (SIMPLE_SCAN_epkowa_devices), "epkowa");
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp11_ = self->priv->usb_context;
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp12_ = g_usb_context_get_devices (_tmp11_);
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	devices = _tmp12_;
+#line 1079 "simple-scan.c"
+	{
+		gint i = 0;
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		i = 0;
+#line 1084 "simple-scan.c"
+		{
+			gboolean _tmp13_ = FALSE;
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp13_ = TRUE;
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			while (TRUE) {
+#line 1091 "simple-scan.c"
+				gint _tmp15_ = 0;
+				GPtrArray* _tmp16_ = NULL;
+				gint _tmp17_ = 0;
+				gint _tmp18_ = 0;
+				GUsbDevice* device = NULL;
+				GPtrArray* _tmp19_ = NULL;
+				gpointer* _tmp20_ = NULL;
+				gint _tmp20__length1 = 0;
+				gint _tmp21_ = 0;
+				GUsbDevice* _tmp22_ = NULL;
+				GUsbDevice* _tmp23_ = NULL;
+				gchar* driver = NULL;
+				GHashTable* _tmp24_ = NULL;
+				GUsbDevice* _tmp25_ = NULL;
+				guint16 _tmp26_ = 0U;
+				GUsbDevice* _tmp27_ = NULL;
+				guint16 _tmp28_ = 0U;
+				gconstpointer _tmp29_ = NULL;
+				gchar* _tmp30_ = NULL;
+				const gchar* _tmp31_ = NULL;
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				if (!_tmp13_) {
+#line 1114 "simple-scan.c"
+					gint _tmp14_ = 0;
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp14_ = i;
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					i = _tmp14_ + 1;
+#line 1120 "simple-scan.c"
+				}
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp13_ = FALSE;
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp15_ = i;
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp16_ = devices;
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp17_ = g_ptr_array_get_length (_tmp16_);
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp18_ = _tmp17_;
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				if (!(_tmp15_ < _tmp18_)) {
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					break;
+#line 1136 "simple-scan.c"
+				}
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp19_ = devices;
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp20_ = _tmp19_->pdata;
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp20__length1 = (gint) _tmp19_->len;
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp21_ = i;
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp22_ = _tmp20_[_tmp21_];
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp23_ = _g_object_ref0 (_tmp22_);
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				device = _tmp23_;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp24_ = driver_map;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp25_ = device;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp26_ = g_usb_device_get_vid (_tmp25_);
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp27_ = device;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp28_ = g_usb_device_get_pid (_tmp27_);
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp29_ = g_hash_table_lookup (_tmp24_, (gpointer) ((guintptr) ((guint32) ((_tmp26_ << 16) | _tmp28_))));
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp30_ = g_strdup ((const gchar*) _tmp29_);
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				driver = _tmp30_;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp31_ = driver;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				if (_tmp31_ != NULL) {
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					result = driver;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_g_object_unref0 (device);
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_g_ptr_array_unref0 (devices);
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_g_hash_table_unref0 (driver_map);
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					return result;
+#line 1182 "simple-scan.c"
+				}
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_g_free0 (driver);
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_g_object_unref0 (device);
+#line 1188 "simple-scan.c"
+			}
+		}
+	}
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	result = NULL;
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_g_ptr_array_unref0 (devices);
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_g_hash_table_unref0 (driver_map);
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	return result;
+#line 1200 "simple-scan.c"
+}
+
+
+static void simple_scan_add_devices (SimpleScan* self, GHashTable* map, guint32* devices, int devices_length1, const gchar* driver) {
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	g_return_if_fail (self != NULL);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	g_return_if_fail (map != NULL);
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	g_return_if_fail (driver != NULL);
+#line 1211 "simple-scan.c"
+	{
+		gint i = 0;
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		i = 0;
+#line 1216 "simple-scan.c"
+		{
+			gboolean _tmp0_ = FALSE;
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp0_ = TRUE;
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			while (TRUE) {
+#line 1223 "simple-scan.c"
+				gint _tmp2_ = 0;
+				guint32* _tmp3_ = NULL;
+				gint _tmp3__length1 = 0;
+				GHashTable* _tmp4_ = NULL;
+				guint32* _tmp5_ = NULL;
+				gint _tmp5__length1 = 0;
+				gint _tmp6_ = 0;
+				guint32 _tmp7_ = 0U;
+				const gchar* _tmp8_ = NULL;
+				gchar* _tmp9_ = NULL;
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				if (!_tmp0_) {
+#line 1236 "simple-scan.c"
+					gint _tmp1_ = 0;
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp1_ = i;
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					i = _tmp1_ + 1;
+#line 1242 "simple-scan.c"
+				}
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp0_ = FALSE;
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp2_ = i;
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp3_ = devices;
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp3__length1 = devices_length1;
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				if (!(_tmp2_ < _tmp3__length1)) {
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					break;
+#line 1256 "simple-scan.c"
+				}
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp4_ = map;
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp5_ = devices;
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp5__length1 = devices_length1;
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp6_ = i;
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp7_ = _tmp5_[_tmp6_];
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp8_ = driver;
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp9_ = g_strdup (_tmp8_);
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				g_hash_table_insert (_tmp4_, (gpointer) ((guintptr) _tmp7_), _tmp9_);
+#line 1274 "simple-scan.c"
+			}
+		}
+	}
 }
 
 
@@ -882,35 +1285,35 @@ static void simple_scan_authorize_cb (SimpleScan* self, Scanner* scanner, const
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	Scanner* _tmp4_ = NULL;
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (resource != NULL);
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->ui;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = resource;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	user_interface_authorize (_tmp0_, _tmp1_, &_tmp2_, &_tmp3_);
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (username);
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	username = _tmp2_;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (password);
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	password = _tmp3_;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = scanner;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_authorize (_tmp4_, username, password);
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (password);
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (username);
-#line 914 "simple-scan.c"
+#line 1317 "simple-scan.c"
 }
 
 
@@ -943,83 +1346,83 @@ static Page* simple_scan_append_page (SimpleScan* self) {
 	UserInterface* _tmp60_ = NULL;
 	Page* _tmp61_ = NULL;
 	Page* _tmp62_ = NULL;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->book;
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = book_get_page (_tmp0_, -1);
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp1_;
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = page;
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp3_ != NULL) {
-#line 959 "simple-scan.c"
+#line 1362 "simple-scan.c"
 		Page* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp4_ = page;
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = page_get_has_data (_tmp4_);
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = _tmp5_;
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp2_ = !_tmp6_;
-#line 971 "simple-scan.c"
+#line 1374 "simple-scan.c"
 	} else {
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp2_ = FALSE;
-#line 975 "simple-scan.c"
+#line 1378 "simple-scan.c"
 	}
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp2_) {
-#line 979 "simple-scan.c"
+#line 1382 "simple-scan.c"
 		UserInterface* _tmp7_ = NULL;
 		Page* _tmp8_ = NULL;
 		Page* _tmp9_ = NULL;
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp7_ = self->priv->ui;
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = page;
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		user_interface_set_selected_page (_tmp7_, _tmp8_);
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp9_ = page;
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		page_start (_tmp9_);
-#line 135 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = page;
-#line 135 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 997 "simple-scan.c"
+#line 1400 "simple-scan.c"
 	}
-#line 139 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	do_crop = FALSE;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	named_crop = NULL;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	width = 100;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	height = 100;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	dpi = 100;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	cx = 0;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	cy = 0;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	cw = 0;
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	ch = 0;
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp10_ = page;
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp10_ != NULL) {
-#line 1023 "simple-scan.c"
+#line 1426 "simple-scan.c"
 		Page* _tmp11_ = NULL;
 		ScanDirection _tmp12_ = 0;
 		ScanDirection _tmp13_ = 0;
@@ -1036,51 +1439,51 @@ static Page* simple_scan_append_page (SimpleScan* self) {
 		gboolean _tmp24_ = FALSE;
 		gboolean _tmp25_ = FALSE;
 		gboolean _tmp26_ = FALSE;
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = page;
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp12_ = page_get_scan_direction (_tmp11_);
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp13_ = _tmp12_;
-#line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		scan_direction = _tmp13_;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp14_ = page;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp15_ = page_get_width (_tmp14_);
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp16_ = _tmp15_;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		width = _tmp16_;
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp17_ = page;
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp18_ = page_get_height (_tmp17_);
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp19_ = _tmp18_;
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		height = _tmp19_;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp20_ = page;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp21_ = page_get_dpi (_tmp20_);
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp22_ = _tmp21_;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		dpi = _tmp22_;
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp23_ = page;
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp24_ = page_get_has_crop (_tmp23_);
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp25_ = _tmp24_;
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		do_crop = _tmp25_;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp26_ = do_crop;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp26_) {
-#line 1084 "simple-scan.c"
+#line 1487 "simple-scan.c"
 			Page* _tmp27_ = NULL;
 			const gchar* _tmp28_ = NULL;
 			const gchar* _tmp29_ = NULL;
@@ -1097,154 +1500,154 @@ static Page* simple_scan_append_page (SimpleScan* self) {
 			Page* _tmp40_ = NULL;
 			gint _tmp41_ = 0;
 			gint _tmp42_ = 0;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp27_ = page;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp28_ = page_get_crop_name (_tmp27_);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp29_ = _tmp28_;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp30_ = g_strdup (_tmp29_);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (named_crop);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			named_crop = _tmp30_;
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp31_ = page;
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp32_ = page_get_crop_x (_tmp31_);
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp33_ = _tmp32_;
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			cx = _tmp33_;
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp34_ = page;
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp35_ = page_get_crop_y (_tmp34_);
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp36_ = _tmp35_;
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			cy = _tmp36_;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp37_ = page;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp38_ = page_get_crop_width (_tmp37_);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp39_ = _tmp38_;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			cw = _tmp39_;
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp40_ = page;
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp41_ = page_get_crop_height (_tmp40_);
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp42_ = _tmp41_;
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			ch = _tmp42_;
-#line 1145 "simple-scan.c"
+#line 1548 "simple-scan.c"
 		}
 	}
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp43_ = width;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp44_ = height;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp45_ = dpi;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp46_ = scan_direction;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp47_ = page_new (_tmp43_, _tmp44_, _tmp45_, _tmp46_);
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp47_;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp48_ = self->priv->book;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp49_ = page;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	book_append_page (_tmp48_, _tmp49_);
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp50_ = do_crop;
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp50_) {
-#line 1172 "simple-scan.c"
+#line 1575 "simple-scan.c"
 		const gchar* _tmp51_ = NULL;
 		Page* _tmp57_ = NULL;
 		gint _tmp58_ = 0;
 		gint _tmp59_ = 0;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp51_ = named_crop;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp51_ != NULL) {
-#line 1181 "simple-scan.c"
+#line 1584 "simple-scan.c"
 			Page* _tmp52_ = NULL;
 			const gchar* _tmp53_ = NULL;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp52_ = page;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp53_ = named_crop;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			page_set_named_crop (_tmp52_, _tmp53_);
-#line 1190 "simple-scan.c"
+#line 1593 "simple-scan.c"
 		} else {
 			Page* _tmp54_ = NULL;
 			gint _tmp55_ = 0;
 			gint _tmp56_ = 0;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp54_ = page;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp55_ = cw;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp56_ = ch;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			page_set_custom_crop (_tmp54_, _tmp55_, _tmp56_);
-#line 1203 "simple-scan.c"
+#line 1606 "simple-scan.c"
 		}
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp57_ = page;
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp58_ = cx;
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp59_ = cy;
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		page_move_crop (_tmp57_, _tmp58_, _tmp59_);
-#line 1213 "simple-scan.c"
+#line 1616 "simple-scan.c"
 	}
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp60_ = self->priv->ui;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp61_ = page;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	user_interface_set_selected_page (_tmp60_, _tmp61_);
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp62_ = page;
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page_start (_tmp62_);
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	result = page;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (named_crop);
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
-#line 1231 "simple-scan.c"
+#line 1634 "simple-scan.c"
 }
 
 
 static void simple_scan_scanner_new_page_cb (SimpleScan* self, Scanner* scanner) {
 	Page* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = simple_scan_append_page (self);
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = _tmp0_;
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (_tmp1_);
-#line 1248 "simple-scan.c"
+#line 1651 "simple-scan.c"
 }
 
 
@@ -1273,79 +1676,79 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 	const gchar* _tmp37_ = NULL;
 	gchar* _tmp38_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (device_name != NULL, NULL);
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = device_name;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = g_strdup_printf ("sane:%s", _tmp0_);
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	device_id = _tmp1_;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = device_name;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:188: Getting color profile for device %s", _tmp2_);
-#line 190 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	g_debug ("simple-scan.vala:282: Getting color profile for device %s", _tmp2_);
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = cd_client_new ();
-#line 190 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	client = _tmp3_;
-#line 1295 "simple-scan.c"
+#line 1698 "simple-scan.c"
 	{
 		CdClient* _tmp4_ = NULL;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp4_ = client;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		cd_client_connect_sync (_tmp4_, NULL, &_inner_error_);
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1304 "simple-scan.c"
-			goto __catch4_g_error;
+#line 1707 "simple-scan.c"
+			goto __catch5_g_error;
 		}
 	}
-	goto __finally4;
-	__catch4_g_error:
+	goto __finally5;
+	__catch5_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = e;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = _tmp5_->message;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:197: Failed to connect to colord: %s", _tmp6_);
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_debug ("simple-scan.vala:291: Failed to connect to colord: %s", _tmp6_);
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1334 "simple-scan.c"
+#line 1737 "simple-scan.c"
 	}
-	__finally4:
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	__finally5:
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
-#line 1349 "simple-scan.c"
+#line 1752 "simple-scan.c"
 	}
 	{
 		CdDevice* _tmp7_ = NULL;
@@ -1353,298 +1756,298 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 		const gchar* _tmp9_ = NULL;
 		CdDevice* _tmp10_ = NULL;
 		CdDevice* _tmp11_ = NULL;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = client;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp9_ = device_id;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp10_ = cd_client_find_device_by_property_sync (_tmp8_, CD_DEVICE_PROPERTY_SERIAL, _tmp9_, NULL, &_inner_error_);
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp7_ = _tmp10_;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1367 "simple-scan.c"
-			goto __catch5_g_error;
+#line 1770 "simple-scan.c"
+			goto __catch6_g_error;
 		}
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = _tmp7_;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp7_ = NULL;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		device = _tmp11_;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1380 "simple-scan.c"
+#line 1783 "simple-scan.c"
 	}
-	goto __finally5;
-	__catch5_g_error:
+	goto __finally6;
+	__catch6_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp12_ = NULL;
 		GError* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp12_ = device_name;
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp13_ = e;
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp14_ = _tmp13_->message;
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:208: Unable to find colord device %s: %s", _tmp12_, _tmp14_);
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_debug ("simple-scan.vala:302: Unable to find colord device %s: %s", _tmp12_, _tmp14_);
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1413 "simple-scan.c"
+#line 1816 "simple-scan.c"
 	}
-	__finally5:
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	__finally6:
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
-#line 1430 "simple-scan.c"
+#line 1833 "simple-scan.c"
 	}
 	{
 		CdDevice* _tmp15_ = NULL;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp15_ = device;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		cd_device_connect_sync (_tmp15_, NULL, &_inner_error_);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1440 "simple-scan.c"
-			goto __catch6_g_error;
+#line 1843 "simple-scan.c"
+			goto __catch7_g_error;
 		}
 	}
-	goto __finally6;
-	__catch6_g_error:
+	goto __finally7;
+	__catch7_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp16_ = NULL;
 		GError* _tmp17_ = NULL;
 		const gchar* _tmp18_ = NULL;
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp16_ = device_name;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp17_ = e;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp18_ = _tmp17_->message;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:218: Failed to get properties from the device %s: %s", _tmp16_, _tmp18_);
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_debug ("simple-scan.vala:312: Failed to get properties from the device %s: %s", _tmp16_, _tmp18_);
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1475 "simple-scan.c"
+#line 1878 "simple-scan.c"
 	}
-	__finally6:
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	__finally7:
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
-#line 1492 "simple-scan.c"
+#line 1895 "simple-scan.c"
 	}
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp19_ = device;
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp20_ = cd_device_get_default_profile (_tmp19_);
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	profile = _tmp20_;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp21_ = profile;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp21_ == NULL) {
-#line 1504 "simple-scan.c"
+#line 1907 "simple-scan.c"
 		const gchar* _tmp22_ = NULL;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp22_ = device_name;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:225: No default color profile for device: %s", _tmp22_);
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_debug ("simple-scan.vala:319: No default color profile for device: %s", _tmp22_);
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (profile);
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1522 "simple-scan.c"
+#line 1925 "simple-scan.c"
 	}
 	{
 		CdProfile* _tmp23_ = NULL;
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp23_ = profile;
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		cd_profile_connect_sync (_tmp23_, NULL, &_inner_error_);
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1532 "simple-scan.c"
-			goto __catch7_g_error;
+#line 1935 "simple-scan.c"
+			goto __catch8_g_error;
 		}
 	}
-	goto __finally7;
-	__catch7_g_error:
+	goto __finally8;
+	__catch8_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp24_ = NULL;
 		GError* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp24_ = device_name;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp25_ = e;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp26_ = _tmp25_->message;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:235: Failed to get properties from the profile %s: %s", _tmp24_, _tmp26_);
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_debug ("simple-scan.vala:329: Failed to get properties from the profile %s: %s", _tmp24_, _tmp26_);
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (profile);
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1569 "simple-scan.c"
+#line 1972 "simple-scan.c"
 	}
-	__finally7:
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	__finally8:
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (profile);
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
-#line 1588 "simple-scan.c"
+#line 1991 "simple-scan.c"
 	}
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp27_ = profile;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp28_ = cd_profile_get_filename (_tmp27_);
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp29_ = _tmp28_;
-#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp29_ == NULL) {
-#line 1598 "simple-scan.c"
+#line 2001 "simple-scan.c"
 		const gchar* _tmp30_ = NULL;
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp30_ = device_name;
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:241: No icc color profile for the device %s", _tmp30_);
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_debug ("simple-scan.vala:335: No icc color profile for the device %s", _tmp30_);
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (profile);
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1616 "simple-scan.c"
+#line 2019 "simple-scan.c"
 	}
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp31_ = profile;
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp32_ = cd_profile_get_filename (_tmp31_);
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp33_ = _tmp32_;
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp34_ = device_name;
-#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:245: Using color profile %s for device %s", _tmp33_, _tmp34_);
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	g_debug ("simple-scan.vala:339: Using color profile %s for device %s", _tmp33_, _tmp34_);
+#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp35_ = profile;
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp36_ = cd_profile_get_filename (_tmp35_);
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp37_ = _tmp36_;
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp38_ = g_strdup (_tmp37_);
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	result = _tmp38_;
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (profile);
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (device);
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (client);
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (device_id);
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 340 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
-#line 1648 "simple-scan.c"
+#line 2051 "simple-scan.c"
 }
 
 
@@ -1662,50 +2065,50 @@ static void simple_scan_scanner_page_info_cb (SimpleScan* self, Scanner* scanner
 	const gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
 	gchar* _tmp11_ = NULL;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (info != NULL);
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = info;
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = _tmp0_->width;
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = info;
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = _tmp2_->height;
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = info;
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp5_ = _tmp4_->depth;
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:254: Page is %d pixels wide, %d pixels high, %d bits " \
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	g_debug ("simple-scan.vala:348: Page is %d pixels wide, %d pixels high, %d bits " \
 "per pixel", _tmp1_, _tmp3_, _tmp5_);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp6_ = simple_scan_append_page (self);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp6_;
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp7_ = info;
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page_set_page_info (page, _tmp7_);
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp8_ = info;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp9_ = _tmp8_->device;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp10_ = simple_scan_get_profile_for_device (self, _tmp9_);
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp11_ = _tmp10_;
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page_set_color_profile (page, _tmp11_);
-#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (_tmp11_);
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
-#line 1708 "simple-scan.c"
+#line 2111 "simple-scan.c"
 }
 
 
@@ -1717,31 +2120,31 @@ static void simple_scan_scanner_line_cb (SimpleScan* self, Scanner* scanner, Sca
 	guint _tmp3_ = 0U;
 	Page* _tmp4_ = NULL;
 	ScanLine* _tmp5_ = NULL;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (line != NULL);
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->book;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = self->priv->book;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = _tmp2_;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = book_get_page (_tmp0_, ((gint) _tmp3_) - 1);
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp4_;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp5_ = line;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page_parse_scan_line (page, _tmp5_);
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
-#line 1744 "simple-scan.c"
+#line 2147 "simple-scan.c"
 }
 
 
@@ -1752,27 +2155,27 @@ static void simple_scan_scanner_page_done_cb (SimpleScan* self, Scanner* scanner
 	guint _tmp2_ = 0U;
 	guint _tmp3_ = 0U;
 	Page* _tmp4_ = NULL;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->book;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = self->priv->book;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = _tmp2_;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = book_get_page (_tmp0_, ((gint) _tmp3_) - 1);
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp4_;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page_finish (page);
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
-#line 1775 "simple-scan.c"
+#line 2178 "simple-scan.c"
 }
 
 
@@ -1786,86 +2189,86 @@ static void simple_scan_remove_empty_page (SimpleScan* self) {
 	Page* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->book;
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = self->priv->book;
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = _tmp2_;
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = book_get_page (_tmp0_, ((gint) _tmp3_) - 1);
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp4_;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp5_ = page;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp6_ = page_get_has_data (_tmp5_);
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp7_ = _tmp6_;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (!_tmp7_) {
-#line 1811 "simple-scan.c"
+#line 2214 "simple-scan.c"
 		Book* _tmp8_ = NULL;
 		Page* _tmp9_ = NULL;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = self->priv->book;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp9_ = page;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		book_delete_page (_tmp8_, _tmp9_);
-#line 1820 "simple-scan.c"
+#line 2223 "simple-scan.c"
 	}
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
-#line 1824 "simple-scan.c"
+#line 2227 "simple-scan.c"
 }
 
 
 static void simple_scan_scanner_document_done_cb (SimpleScan* self, Scanner* scanner) {
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_remove_empty_page (self);
-#line 1835 "simple-scan.c"
+#line 2238 "simple-scan.c"
 }
 
 
 static void simple_scan_scanner_failed_cb (SimpleScan* self, Scanner* scanner, gint error_code, const gchar* error_string) {
 	gint _tmp0_ = 0;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (error_string != NULL);
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_remove_empty_page (self);
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = error_code;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp0_ != ((gint) SANE_STATUS_CANCELLED)) {
-#line 1853 "simple-scan.c"
+#line 2256 "simple-scan.c"
 		UserInterface* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp1_ = self->priv->ui;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp2_ = _ ("Failed to scan");
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp3_ = error_string;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp4_ = self->priv->have_devices;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		user_interface_show_error (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 1868 "simple-scan.c"
+#line 2271 "simple-scan.c"
 	}
 }
 
@@ -1874,19 +2277,19 @@ static void simple_scan_scanner_scanning_changed_cb (SimpleScan* self, Scanner*
 	UserInterface* _tmp0_ = NULL;
 	Scanner* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->ui;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = scanner;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = scanner_is_scanning (_tmp1_);
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	user_interface_set_scanning (_tmp0_, _tmp2_);
-#line 1889 "simple-scan.c"
+#line 2292 "simple-scan.c"
 }
 
 
@@ -1896,123 +2299,63 @@ static void simple_scan_scan_cb (SimpleScan* self, UserInterface* ui, const gcha
 	const gchar* _tmp2_ = NULL;
 	Scanner* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-	gchar* filename_prefix = NULL;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* extension = NULL;
+	Scanner* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
 	ScanOptions* _tmp9_ = NULL;
-	ScanMode _tmp10_ = 0;
-	gchar* filename = NULL;
-	const gchar* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	UserInterface* _tmp16_ = NULL;
-	Scanner* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	ScanOptions* _tmp19_ = NULL;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (ui != NULL);
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (options != NULL);
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = options;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = _tmp0_->dpi;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = device;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:310: Requesting scan at %d dpi from device '%s'", _tmp1_, _tmp2_);
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	g_debug ("simple-scan.vala:404: Requesting scan at %d dpi from device '%s'", _tmp1_, _tmp2_);
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = self->priv->scanner;
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = scanner_is_scanning (_tmp3_);
-#line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (!_tmp4_) {
-#line 1933 "simple-scan.c"
+#line 2325 "simple-scan.c"
 		Page* _tmp5_ = NULL;
 		Page* _tmp6_ = NULL;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = simple_scan_append_page (self);
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = _tmp5_;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_page_unref0 (_tmp6_);
-#line 1942 "simple-scan.c"
+#line 2334 "simple-scan.c"
 	}
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp7_ = _ ("Scanned Document");
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp8_ = g_strdup (_tmp7_);
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	filename_prefix = _tmp8_;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp7_ = self->priv->scanner;
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp8_ = device;
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp9_ = options;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp10_ = _tmp9_->scan_mode;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp10_ == SCAN_MODE_COLOR) {
-#line 1956 "simple-scan.c"
-		gchar* _tmp11_ = NULL;
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp11_ = g_strdup ("jpg");
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (extension);
-#line 319 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		extension = _tmp11_;
-#line 1964 "simple-scan.c"
-	} else {
-		gchar* _tmp12_ = NULL;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp12_ = g_strdup ("pdf");
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (extension);
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		extension = _tmp12_;
-#line 1973 "simple-scan.c"
-	}
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp13_ = filename_prefix;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp14_ = extension;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp15_ = g_strdup_printf ("%s.%s", _tmp13_, _tmp14_);
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	filename = _tmp15_;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp16_ = ui;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	user_interface_set_default_file_name (_tmp16_, filename);
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp17_ = self->priv->scanner;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp18_ = device;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp19_ = options;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	scanner_scan (_tmp17_, _tmp18_, _tmp19_);
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (filename);
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (extension);
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (filename_prefix);
-#line 2001 "simple-scan.c"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	scanner_scan (_tmp7_, _tmp8_, _tmp9_);
+#line 2344 "simple-scan.c"
 }
 
 
 static void simple_scan_cancel_cb (SimpleScan* self, UserInterface* ui) {
 	Scanner* _tmp0_ = NULL;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (ui != NULL);
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 414 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->scanner;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 414 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_cancel (_tmp0_);
-#line 2015 "simple-scan.c"
+#line 2358 "simple-scan.c"
 }
 
 
@@ -2024,98 +2367,98 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 	gchar* _tmp2_ = NULL;
 	gchar* path = NULL;
 	GError * _inner_error_ = NULL;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (prefix != NULL, NULL);
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (extension != NULL, NULL);
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = prefix;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = extension;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_);
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	filename = _tmp2_;
-#line 2041 "simple-scan.c"
+#line 2384 "simple-scan.c"
 	{
 		gint fd = 0;
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp3_ = filename;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = g_file_open_tmp (_tmp3_, &_tmp4_, &_inner_error_);
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (path);
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		path = _tmp4_;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fd = _tmp5_;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2060 "simple-scan.c"
-			goto __catch8_g_error;
+#line 2403 "simple-scan.c"
+			goto __catch9_g_error;
 		}
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = fd;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		close (_tmp6_);
-#line 2067 "simple-scan.c"
+#line 2410 "simple-scan.c"
 	}
-	goto __finally8;
-	__catch8_g_error:
+	goto __finally9;
+	__catch9_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 431 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp7_ = e;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 431 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = _tmp7_->message;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_warning ("simple-scan.vala:346: Error saving email attachment: %s", _tmp8_);
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 431 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_warning ("simple-scan.vala:431: Error saving email attachment: %s", _tmp8_);
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (path);
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (filename);
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 2095 "simple-scan.c"
+#line 2438 "simple-scan.c"
 	}
-	__finally8:
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	__finally9:
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (path);
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (filename);
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
-#line 2110 "simple-scan.c"
+#line 2453 "simple-scan.c"
 	}
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	result = path;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (filename);
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
-#line 2118 "simple-scan.c"
+#line 2461 "simple-scan.c"
 }
 
 
@@ -2126,35 +2469,35 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp42_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (ui != NULL);
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (profile != NULL);
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	saved = FALSE;
-#line 356 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = g_strdup ("xdg-email");
-#line 356 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	command_line = _tmp0_;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = profile;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (g_strcmp0 (_tmp1_, "text") == 0) {
-#line 2145 "simple-scan.c"
+#line 2488 "simple-scan.c"
 		gchar* path = NULL;
 		gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp2_ = simple_scan_get_temporary_filename (self, "scan", "pdf");
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		path = _tmp2_;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp3_ = path;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp3_ != NULL) {
-#line 2157 "simple-scan.c"
+#line 2500 "simple-scan.c"
 			GFile* file = NULL;
 			const gchar* _tmp4_ = NULL;
 			GFile* _tmp5_ = NULL;
@@ -2164,121 +2507,121 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 			gchar* _tmp15_ = NULL;
 			gchar* _tmp16_ = NULL;
 			gchar* _tmp17_ = NULL;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp4_ = path;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp5_ = g_file_new_for_path (_tmp4_);
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			file = _tmp5_;
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp6_ = ui;
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			user_interface_show_progress_dialog (_tmp6_);
-#line 2177 "simple-scan.c"
+#line 2520 "simple-scan.c"
 			{
 				Book* _tmp7_ = NULL;
 				gint _tmp8_ = 0;
 				GFile* _tmp9_ = NULL;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp7_ = self->priv->book;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp8_ = quality;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp9_ = file;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				book_save (_tmp7_, "pdf", _tmp8_, _tmp9_, &_inner_error_);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2192 "simple-scan.c"
-					goto __catch9_g_error;
+#line 2535 "simple-scan.c"
+					goto __catch10_g_error;
 				}
 			}
-			goto __finally9;
-			__catch9_g_error:
+			goto __finally10;
+			__catch10_g_error:
 			{
 				GError* e = NULL;
 				UserInterface* _tmp10_ = NULL;
 				GError* _tmp11_ = NULL;
 				const gchar* _tmp12_ = NULL;
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				e = _inner_error_;
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_inner_error_ = NULL;
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp10_ = ui;
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				user_interface_hide_progress_dialog (_tmp10_);
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp11_ = e;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp12_ = _tmp11_->message;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				g_warning ("simple-scan.vala:374: Unable to save email file: %s", _tmp12_);
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				g_warning ("simple-scan.vala:459: Unable to save email file: %s", _tmp12_);
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_error_free0 (e);
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_object_unref0 (file);
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_free0 (path);
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_free0 (command_line);
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				return;
-#line 2227 "simple-scan.c"
+#line 2570 "simple-scan.c"
 			}
-			__finally9:
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			__finally10:
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_object_unref0 (file);
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_free0 (path);
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_free0 (command_line);
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				g_clear_error (&_inner_error_);
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				return;
-#line 2244 "simple-scan.c"
+#line 2587 "simple-scan.c"
 			}
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp13_ = command_line;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp14_ = path;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp15_ = g_strdup_printf (" --attach %s", _tmp14_);
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp16_ = _tmp15_;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp17_ = g_strconcat (_tmp13_, _tmp16_, NULL);
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (command_line);
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			command_line = _tmp17_;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (_tmp16_);
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_object_unref0 (file);
-#line 2264 "simple-scan.c"
+#line 2607 "simple-scan.c"
 		}
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (path);
-#line 2268 "simple-scan.c"
+#line 2611 "simple-scan.c"
 	} else {
 		{
 			gint i = 0;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			i = 0;
-#line 2274 "simple-scan.c"
+#line 2617 "simple-scan.c"
 			{
 				gboolean _tmp18_ = FALSE;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp18_ = TRUE;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				while (TRUE) {
-#line 2281 "simple-scan.c"
+#line 2624 "simple-scan.c"
 					gint _tmp20_ = 0;
 					Book* _tmp21_ = NULL;
 					guint _tmp22_ = 0U;
@@ -2295,55 +2638,55 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 					gchar* _tmp39_ = NULL;
 					gchar* _tmp40_ = NULL;
 					gboolean _tmp41_ = FALSE;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (!_tmp18_) {
-#line 2300 "simple-scan.c"
+#line 2643 "simple-scan.c"
 						gint _tmp19_ = 0;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp19_ = i;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						i = _tmp19_ + 1;
-#line 2306 "simple-scan.c"
+#line 2649 "simple-scan.c"
 					}
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp18_ = FALSE;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp20_ = i;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp21_ = self->priv->book;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp22_ = book_get_n_pages (_tmp21_);
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp23_ = _tmp22_;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (!(((guint) _tmp20_) < _tmp23_)) {
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
-#line 2322 "simple-scan.c"
+#line 2665 "simple-scan.c"
 					}
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp24_ = simple_scan_get_temporary_filename (self, "scan", "jpg");
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					path = _tmp24_;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp25_ = path;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (_tmp25_ == NULL) {
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						saved = FALSE;
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (path);
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
-#line 2338 "simple-scan.c"
+#line 2681 "simple-scan.c"
 					}
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp26_ = path;
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp27_ = g_file_new_for_path (_tmp26_);
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					file = _tmp27_;
-#line 2346 "simple-scan.c"
+#line 2689 "simple-scan.c"
 					{
 						Book* _tmp28_ = NULL;
 						gint _tmp29_ = 0;
@@ -2351,163 +2694,163 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 						Page* _tmp31_ = NULL;
 						gint _tmp32_ = 0;
 						GFile* _tmp33_ = NULL;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp28_ = self->priv->book;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp29_ = i;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp30_ = book_get_page (_tmp28_, _tmp29_);
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp31_ = _tmp30_;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp32_ = quality;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp33_ = file;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						page_save (_tmp31_, "jpeg", _tmp32_, _tmp33_, &_inner_error_);
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_page_unref0 (_tmp31_);
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2372 "simple-scan.c"
-							goto __catch10_g_error;
+#line 2715 "simple-scan.c"
+							goto __catch11_g_error;
 						}
 					}
-					goto __finally10;
-					__catch10_g_error:
+					goto __finally11;
+					__catch11_g_error:
 					{
 						GError* e = NULL;
 						GError* _tmp34_ = NULL;
 						const gchar* _tmp35_ = NULL;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						e = _inner_error_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_inner_error_ = NULL;
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp34_ = e;
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp35_ = _tmp34_->message;
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						g_warning ("simple-scan.vala:398: Unable to save email file: %s", _tmp35_);
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						g_warning ("simple-scan.vala:483: Unable to save email file: %s", _tmp35_);
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_error_free0 (e);
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_object_unref0 (file);
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (path);
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (command_line);
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						return;
-#line 2402 "simple-scan.c"
+#line 2745 "simple-scan.c"
 					}
-					__finally10:
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					__finally11:
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_object_unref0 (file);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (path);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (command_line);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						g_clear_error (&_inner_error_);
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						return;
-#line 2419 "simple-scan.c"
+#line 2762 "simple-scan.c"
 					}
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp36_ = command_line;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp37_ = path;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp38_ = g_strdup_printf (" --attach %s", _tmp37_);
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp39_ = _tmp38_;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp40_ = g_strconcat (_tmp36_, _tmp39_, NULL);
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_free0 (command_line);
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					command_line = _tmp40_;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_free0 (_tmp39_);
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp41_ = saved;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (!_tmp41_) {
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_object_unref0 (file);
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (path);
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
-#line 2447 "simple-scan.c"
+#line 2790 "simple-scan.c"
 					}
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_object_unref0 (file);
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_free0 (path);
-#line 2453 "simple-scan.c"
+#line 2796 "simple-scan.c"
 				}
 			}
 		}
 	}
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp42_ = command_line;
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:408: Launching email client: %s", _tmp42_);
-#line 2462 "simple-scan.c"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	g_debug ("simple-scan.vala:493: Launching email client: %s", _tmp42_);
+#line 2805 "simple-scan.c"
 	{
 		const gchar* _tmp43_ = NULL;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp43_ = command_line;
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_spawn_command_line_async (_tmp43_, &_inner_error_);
-#line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2471 "simple-scan.c"
-			goto __catch11_g_error;
+#line 2814 "simple-scan.c"
+			goto __catch12_g_error;
 		}
 	}
-	goto __finally11;
-	__catch11_g_error:
+	goto __finally12;
+	__catch12_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp44_ = NULL;
 		const gchar* _tmp45_ = NULL;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp44_ = e;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp45_ = _tmp44_->message;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_warning ("simple-scan.vala:415: Unable to start email: %s", _tmp45_);
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_warning ("simple-scan.vala:500: Unable to start email: %s", _tmp45_);
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 2493 "simple-scan.c"
+#line 2836 "simple-scan.c"
 	}
-	__finally11:
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	__finally12:
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (command_line);
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return;
-#line 2506 "simple-scan.c"
+#line 2849 "simple-scan.c"
 	}
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (command_line);
-#line 2510 "simple-scan.c"
+#line 2853 "simple-scan.c"
 }
 
 
@@ -2520,173 +2863,155 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 	const gchar* _tmp11_ = NULL;
 	const gchar* _tmp12_ = NULL;
 	gboolean _tmp13_ = FALSE;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (message != NULL);
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = log_level;
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	switch (_tmp0_ & G_LOG_LEVEL_MASK) {
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_ERROR:
-#line 2531 "simple-scan.c"
+#line 2874 "simple-scan.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp1_ = g_strdup ("ERROR:");
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp1_;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2542 "simple-scan.c"
+#line 2885 "simple-scan.c"
 		}
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_CRITICAL:
-#line 2546 "simple-scan.c"
+#line 2889 "simple-scan.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp2_ = g_strdup ("CRITICAL:");
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp2_;
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2557 "simple-scan.c"
+#line 2900 "simple-scan.c"
 		}
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_WARNING:
-#line 2561 "simple-scan.c"
+#line 2904 "simple-scan.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp3_ = g_strdup ("WARNING:");
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp3_;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2572 "simple-scan.c"
+#line 2915 "simple-scan.c"
 		}
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_MESSAGE:
-#line 2576 "simple-scan.c"
+#line 2919 "simple-scan.c"
 		{
 			gchar* _tmp4_ = NULL;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp4_ = g_strdup ("MESSAGE:");
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp4_;
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2587 "simple-scan.c"
+#line 2930 "simple-scan.c"
 		}
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_INFO:
-#line 2591 "simple-scan.c"
+#line 2934 "simple-scan.c"
 		{
 			gchar* _tmp5_ = NULL;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp5_ = g_strdup ("INFO:");
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp5_;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2602 "simple-scan.c"
+#line 2945 "simple-scan.c"
 		}
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_DEBUG:
-#line 2606 "simple-scan.c"
+#line 2949 "simple-scan.c"
 		{
 			gchar* _tmp6_ = NULL;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp6_ = g_strdup ("DEBUG:");
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp6_;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2617 "simple-scan.c"
+#line 2960 "simple-scan.c"
 		}
 		default:
 		{
 			gchar* _tmp7_ = NULL;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp7_ = g_strdup ("LOG:");
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp7_;
-#line 445 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2630 "simple-scan.c"
+#line 2973 "simple-scan.c"
 		}
 	}
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp8_ = simple_scan_log_file;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp9_ = simple_scan_log_timer;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp10_ = g_timer_elapsed (_tmp9_, NULL);
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp11_ = prefix;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp12_ = message;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	fprintf (_tmp8_, "[%+.2fs] %s %s\n", _tmp10_, _tmp11_, _tmp12_);
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp13_ = simple_scan_debug_enabled;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp13_) {
-#line 2649 "simple-scan.c"
+#line 2992 "simple-scan.c"
 		FILE* _tmp14_ = NULL;
 		GTimer* _tmp15_ = NULL;
 		gdouble _tmp16_ = 0.0;
 		const gchar* _tmp17_ = NULL;
 		const gchar* _tmp18_ = NULL;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp14_ = stderr;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp15_ = simple_scan_log_timer;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp16_ = g_timer_elapsed (_tmp15_, NULL);
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp17_ = prefix;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp18_ = message;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp14_, "[%+.2fs] %s %s\n", _tmp16_, _tmp17_, _tmp18_);
-#line 2667 "simple-scan.c"
+#line 3010 "simple-scan.c"
 	}
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (prefix);
-#line 2671 "simple-scan.c"
-}
-
-
-static void simple_scan_on_uevent (SimpleScan* self, GUdevClient* client, const gchar* action, GUdevDevice* device) {
-	Scanner* _tmp0_ = NULL;
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (self != NULL);
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (client != NULL);
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (action != NULL);
-#line 453 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_return_if_fail (device != NULL);
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp0_ = self->priv->scanner;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	scanner_redetect (_tmp0_);
-#line 2689 "simple-scan.c"
+#line 3014 "simple-scan.c"
 }
 
 
@@ -2709,7 +3034,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1198 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 2712 "simple-scan.c"
+#line 3037 "simple-scan.c"
 		glong _tmp4_ = 0L;
 #line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -2717,7 +3042,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return result;
-#line 2720 "simple-scan.c"
+#line 3045 "simple-scan.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -2729,7 +3054,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return result;
-#line 2732 "simple-scan.c"
+#line 3057 "simple-scan.c"
 	}
 }
 
@@ -2753,21 +3078,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 2756 "simple-scan.c"
+#line 3081 "simple-scan.c"
 		glong _tmp2_ = 0L;
 #line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 2762 "simple-scan.c"
+#line 3087 "simple-scan.c"
 	} else {
 #line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 2766 "simple-scan.c"
+#line 3091 "simple-scan.c"
 	}
 #line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 2770 "simple-scan.c"
+#line 3095 "simple-scan.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -2779,7 +3104,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 2782 "simple-scan.c"
+#line 3107 "simple-scan.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -2789,13 +3114,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 2792 "simple-scan.c"
+#line 3117 "simple-scan.c"
 	}
 #line 1217 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1217 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 2798 "simple-scan.c"
+#line 3123 "simple-scan.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -2809,7 +3134,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1219 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 2812 "simple-scan.c"
+#line 3137 "simple-scan.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -2819,13 +3144,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 2822 "simple-scan.c"
+#line 3147 "simple-scan.c"
 	}
 #line 1223 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1223 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 2828 "simple-scan.c"
+#line 3153 "simple-scan.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
@@ -2834,7 +3159,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 2837 "simple-scan.c"
+#line 3162 "simple-scan.c"
 	}
 #line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -2854,7 +3179,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	return result;
-#line 2857 "simple-scan.c"
+#line 3182 "simple-scan.c"
 }
 
 
@@ -2886,63 +3211,63 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 	gint _tmp106_ = 0;
 	gboolean _tmp107_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (filename != NULL);
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = filename;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_file_get_contents (_tmp0_, (gchar**) (&_tmp1_), &_tmp2_, &_inner_error_);
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	data = (g_free (data), NULL);
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	data = _tmp1_;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	data_length1 = _tmp2_;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_data_size_ = data_length1;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_propagate_error (error, _inner_error_);
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		data = (g_free (data), NULL);
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return;
-#line 2911 "simple-scan.c"
+#line 3236 "simple-scan.c"
 	}
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = filename;
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = g_strconcat (_tmp3_, ".fixed", NULL);
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp5_ = _tmp4_;
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp6_ = g_fopen (_tmp5_, "w");
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp7_ = _tmp6_;
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (_tmp5_);
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	fixed_file = _tmp7_;
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	offset = 0;
-#line 466 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	line_number = 0;
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 547 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	xref_offset = 0;
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	xref_line = -1;
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	startxref_line = -1;
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	fixed_size = -1;
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp8_ = g_string_new ("");
-#line 471 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	line = _tmp8_;
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	while (TRUE) {
-#line 2945 "simple-scan.c"
+#line 3270 "simple-scan.c"
 		gint _tmp9_ = 0;
 		gint end_offset = 0;
 		gint _tmp10_ = 0;
@@ -2955,25 +3280,25 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 		gint _tmp26_ = 0;
 		gint _tmp100_ = 0;
 		gint _tmp101_ = 0;
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp9_ = offset;
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (!(_tmp9_ < data_length1)) {
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2964 "simple-scan.c"
+#line 3289 "simple-scan.c"
 		}
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp10_ = offset;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		end_offset = _tmp10_;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = line;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_string_assign (_tmp11_, "");
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		while (TRUE) {
-#line 2976 "simple-scan.c"
+#line 3301 "simple-scan.c"
 			gint _tmp12_ = 0;
 			guint8 c = 0U;
 			gint _tmp13_ = 0;
@@ -2982,148 +3307,148 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 			guint8 _tmp16_ = 0U;
 			gint _tmp17_ = 0;
 			guint8 _tmp18_ = 0U;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp12_ = end_offset;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (!(_tmp12_ < data_length1)) {
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				break;
-#line 2991 "simple-scan.c"
+#line 3316 "simple-scan.c"
 			}
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp13_ = end_offset;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp14_ = data[_tmp13_];
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			c = _tmp14_;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp15_ = line;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp16_ = c;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			g_string_append_c (_tmp15_, (gchar) _tmp16_);
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp17_ = end_offset;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			end_offset = _tmp17_ + 1;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp18_ = c;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (_tmp18_ == ((guint8) '\n')) {
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				break;
-#line 3015 "simple-scan.c"
+#line 3340 "simple-scan.c"
 			}
 		}
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp19_ = line;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp20_ = _tmp19_->str;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (g_strcmp0 (_tmp20_, "startxref\n") == 0) {
-#line 3024 "simple-scan.c"
+#line 3349 "simple-scan.c"
 			gint _tmp21_ = 0;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp21_ = line_number;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			startxref_line = _tmp21_;
-#line 3030 "simple-scan.c"
+#line 3355 "simple-scan.c"
 		}
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp22_ = line;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp23_ = _tmp22_->str;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (g_strcmp0 (_tmp23_, "xref\n") == 0) {
-#line 3038 "simple-scan.c"
+#line 3363 "simple-scan.c"
 			gint _tmp24_ = 0;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp24_ = line_number;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			xref_line = _tmp24_;
-#line 3044 "simple-scan.c"
+#line 3369 "simple-scan.c"
 		}
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp26_ = line_number;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp26_ < 2) {
-#line 3050 "simple-scan.c"
+#line 3375 "simple-scan.c"
 			GString* _tmp27_ = NULL;
 			const gchar* _tmp28_ = NULL;
 			gboolean _tmp29_ = FALSE;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp27_ = line;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp28_ = _tmp27_->str;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp29_ = g_str_has_prefix (_tmp28_, "%%");
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp25_ = _tmp29_;
-#line 3062 "simple-scan.c"
+#line 3387 "simple-scan.c"
 		} else {
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp25_ = FALSE;
-#line 3066 "simple-scan.c"
+#line 3391 "simple-scan.c"
 		}
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp25_) {
-#line 3070 "simple-scan.c"
+#line 3395 "simple-scan.c"
 			gint _tmp30_ = 0;
 			FILE* _tmp31_ = NULL;
 			GString* _tmp32_ = NULL;
 			const gchar* _tmp33_ = NULL;
 			gchar* _tmp34_ = NULL;
 			gchar* _tmp35_ = NULL;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp30_ = xref_offset;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			xref_offset = _tmp30_ - 1;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp31_ = fixed_file;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp32_ = line;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp33_ = _tmp32_->str;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp34_ = string_substring (_tmp33_, (glong) 1, (glong) (-1));
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp35_ = _tmp34_;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			fprintf (_tmp31_, "%s", _tmp35_);
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (_tmp35_);
-#line 3095 "simple-scan.c"
+#line 3420 "simple-scan.c"
 		} else {
 			gboolean _tmp36_ = FALSE;
 			gint _tmp37_ = 0;
 			gint _tmp38_ = 0;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp37_ = line_number;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp38_ = xref_line;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (_tmp37_ == (_tmp38_ + 1)) {
-#line 3106 "simple-scan.c"
+#line 3431 "simple-scan.c"
 				GString* _tmp39_ = NULL;
 				const gchar* _tmp40_ = NULL;
 				gboolean _tmp41_ = FALSE;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp39_ = line;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp40_ = _tmp39_->str;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp41_ = g_str_has_prefix (_tmp40_, "1 ");
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp36_ = _tmp41_;
-#line 3118 "simple-scan.c"
+#line 3443 "simple-scan.c"
 			} else {
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp36_ = FALSE;
-#line 3122 "simple-scan.c"
+#line 3447 "simple-scan.c"
 			}
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (_tmp36_) {
-#line 3126 "simple-scan.c"
+#line 3451 "simple-scan.c"
 				GString* _tmp42_ = NULL;
 				const gchar* _tmp43_ = NULL;
 				gchar* _tmp44_ = NULL;
@@ -3132,105 +3457,105 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 				FILE* _tmp47_ = NULL;
 				gint _tmp48_ = 0;
 				FILE* _tmp49_ = NULL;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp42_ = line;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp43_ = _tmp42_->str;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp44_ = string_substring (_tmp43_, (glong) 2, (glong) (-1));
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp45_ = _tmp44_;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp46_ = atoi (_tmp45_);
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				fixed_size = _tmp46_ + 1;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_free0 (_tmp45_);
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp47_ = fixed_file;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp48_ = fixed_size;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				fprintf (_tmp47_, "0 %d\n", _tmp48_);
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp49_ = fixed_file;
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				fprintf (_tmp49_, "0000000000 65535 f \n");
-#line 3159 "simple-scan.c"
+#line 3484 "simple-scan.c"
 			} else {
 				gboolean _tmp50_ = FALSE;
 				gint _tmp51_ = 0;
 				gint _tmp52_ = 0;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp51_ = line_number;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp52_ = xref_line;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				if (_tmp51_ > _tmp52_) {
-#line 3170 "simple-scan.c"
+#line 3495 "simple-scan.c"
 					GString* _tmp53_ = NULL;
 					const gchar* _tmp54_ = NULL;
 					gboolean _tmp55_ = FALSE;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp53_ = line;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp54_ = _tmp53_->str;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp55_ = g_str_has_suffix (_tmp54_, " 0000 n\n");
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp50_ = _tmp55_;
-#line 3182 "simple-scan.c"
+#line 3507 "simple-scan.c"
 				} else {
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp50_ = FALSE;
-#line 3186 "simple-scan.c"
+#line 3511 "simple-scan.c"
 				}
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				if (_tmp50_) {
-#line 3190 "simple-scan.c"
+#line 3515 "simple-scan.c"
 					FILE* _tmp56_ = NULL;
 					GString* _tmp57_ = NULL;
 					const gchar* _tmp58_ = NULL;
 					gint _tmp59_ = 0;
 					gint _tmp60_ = 0;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp56_ = fixed_file;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp57_ = line;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp58_ = _tmp57_->str;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp59_ = atoi (_tmp58_);
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp60_ = xref_offset;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					fprintf (_tmp56_, "%010d 00000 n \n", _tmp59_ + _tmp60_);
-#line 3208 "simple-scan.c"
+#line 3533 "simple-scan.c"
 				} else {
 					gboolean _tmp61_ = FALSE;
 					gint _tmp62_ = 0;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp62_ = startxref_line;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (_tmp62_ > 0) {
-#line 3216 "simple-scan.c"
+#line 3541 "simple-scan.c"
 						gint _tmp63_ = 0;
 						gint _tmp64_ = 0;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp63_ = line_number;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp64_ = startxref_line;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp61_ = _tmp63_ == (_tmp64_ + 1);
-#line 3225 "simple-scan.c"
+#line 3550 "simple-scan.c"
 					} else {
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp61_ = FALSE;
-#line 3229 "simple-scan.c"
+#line 3554 "simple-scan.c"
 					}
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (_tmp61_) {
-#line 3233 "simple-scan.c"
+#line 3558 "simple-scan.c"
 						FILE* _tmp65_ = NULL;
 						GString* _tmp66_ = NULL;
 						const gchar* _tmp67_ = NULL;
@@ -3238,173 +3563,173 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 						gint _tmp69_ = 0;
 						gchar* _tmp70_ = NULL;
 						gchar* _tmp71_ = NULL;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp65_ = fixed_file;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp66_ = line;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp67_ = _tmp66_->str;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp68_ = atoi (_tmp67_);
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp69_ = xref_offset;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp70_ = g_strdup_printf ("%d\n", _tmp68_ + _tmp69_);
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp71_ = _tmp70_;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						fprintf (_tmp65_, "%s", _tmp71_);
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (_tmp71_);
-#line 3259 "simple-scan.c"
+#line 3584 "simple-scan.c"
 					} else {
 						gboolean _tmp72_ = FALSE;
 						gint _tmp73_ = 0;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp73_ = fixed_size;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (_tmp73_ > 0) {
-#line 3267 "simple-scan.c"
+#line 3592 "simple-scan.c"
 							GString* _tmp74_ = NULL;
 							const gchar* _tmp75_ = NULL;
 							gboolean _tmp76_ = FALSE;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp74_ = line;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp75_ = _tmp74_->str;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp76_ = g_str_has_prefix (_tmp75_, "/Size ");
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp72_ = _tmp76_;
-#line 3279 "simple-scan.c"
+#line 3604 "simple-scan.c"
 						} else {
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp72_ = FALSE;
-#line 3283 "simple-scan.c"
+#line 3608 "simple-scan.c"
 						}
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (_tmp72_) {
-#line 3287 "simple-scan.c"
+#line 3612 "simple-scan.c"
 							FILE* _tmp77_ = NULL;
 							gint _tmp78_ = 0;
 							gchar* _tmp79_ = NULL;
 							gchar* _tmp80_ = NULL;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp77_ = fixed_file;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp78_ = fixed_size;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp79_ = g_strdup_printf ("/Size %d\n", _tmp78_);
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp80_ = _tmp79_;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							fprintf (_tmp77_, "%s", _tmp80_);
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_g_free0 (_tmp80_);
-#line 3304 "simple-scan.c"
+#line 3629 "simple-scan.c"
 						} else {
 							gboolean _tmp81_ = FALSE;
 							gint _tmp82_ = 0;
 							gint _tmp83_ = 0;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp82_ = line_number;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp83_ = startxref_line;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							if (_tmp82_ == (_tmp83_ + 2)) {
-#line 3315 "simple-scan.c"
+#line 3640 "simple-scan.c"
 								GString* _tmp84_ = NULL;
 								const gchar* _tmp85_ = NULL;
 								gboolean _tmp86_ = FALSE;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp84_ = line;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp85_ = _tmp84_->str;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp86_ = g_str_has_prefix (_tmp85_, "%%%%");
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp81_ = _tmp86_;
-#line 3327 "simple-scan.c"
+#line 3652 "simple-scan.c"
 							} else {
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp81_ = FALSE;
-#line 3331 "simple-scan.c"
+#line 3656 "simple-scan.c"
 							}
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							if (_tmp81_) {
-#line 3335 "simple-scan.c"
+#line 3660 "simple-scan.c"
 								FILE* _tmp87_ = NULL;
 								GString* _tmp88_ = NULL;
 								const gchar* _tmp89_ = NULL;
 								gchar* _tmp90_ = NULL;
 								gchar* _tmp91_ = NULL;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp87_ = fixed_file;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp88_ = line;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp89_ = _tmp88_->str;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp90_ = string_substring (_tmp89_, (glong) 2, (glong) (-1));
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp91_ = _tmp90_;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								fprintf (_tmp87_, "%s", _tmp91_);
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_g_free0 (_tmp91_);
-#line 3355 "simple-scan.c"
+#line 3680 "simple-scan.c"
 							} else {
 								{
 									gint i = 0;
 									gint _tmp92_ = 0;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									_tmp92_ = offset;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									i = _tmp92_;
-#line 3364 "simple-scan.c"
+#line 3689 "simple-scan.c"
 									{
 										gboolean _tmp93_ = FALSE;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 										_tmp93_ = TRUE;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 										while (TRUE) {
-#line 3371 "simple-scan.c"
+#line 3696 "simple-scan.c"
 											gint _tmp95_ = 0;
 											gint _tmp96_ = 0;
 											FILE* _tmp97_ = NULL;
 											gint _tmp98_ = 0;
 											guint8 _tmp99_ = 0U;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 											if (!_tmp93_) {
-#line 3379 "simple-scan.c"
+#line 3704 "simple-scan.c"
 												gint _tmp94_ = 0;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 												_tmp94_ = i;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 												i = _tmp94_ + 1;
-#line 3385 "simple-scan.c"
+#line 3710 "simple-scan.c"
 											}
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 											_tmp93_ = FALSE;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 											_tmp95_ = i;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 											_tmp96_ = end_offset;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 											if (!(_tmp95_ < _tmp96_)) {
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 												break;
-#line 3397 "simple-scan.c"
+#line 3722 "simple-scan.c"
 											}
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 											_tmp97_ = fixed_file;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 											_tmp98_ = i;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 											_tmp99_ = data[_tmp98_];
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 											fputc ((gchar) _tmp99_, _tmp97_);
-#line 3407 "simple-scan.c"
+#line 3732 "simple-scan.c"
 										}
 									}
 								}
@@ -3414,65 +3739,65 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 				}
 			}
 		}
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp100_ = line_number;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		line_number = _tmp100_ + 1;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp101_ = end_offset;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		offset = _tmp101_;
-#line 3425 "simple-scan.c"
+#line 3750 "simple-scan.c"
 	}
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp102_ = filename;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp103_ = filename;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp104_ = g_strconcat (_tmp103_, "~", NULL);
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp105_ = _tmp104_;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp106_ = g_rename (_tmp102_, _tmp105_);
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp107_ = _tmp106_ >= 0;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (_tmp105_);
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp107_) {
-#line 3443 "simple-scan.c"
+#line 3768 "simple-scan.c"
 		const gchar* _tmp108_ = NULL;
 		gchar* _tmp109_ = NULL;
 		gchar* _tmp110_ = NULL;
 		const gchar* _tmp111_ = NULL;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp108_ = filename;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp109_ = g_strconcat (_tmp108_, ".fixed", NULL);
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp110_ = _tmp109_;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp111_ = filename;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_rename (_tmp110_, _tmp111_);
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (_tmp110_);
-#line 3460 "simple-scan.c"
+#line 3785 "simple-scan.c"
 	}
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_string_free0 (line);
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_fclose0 (fixed_file);
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	data = (g_free (data), NULL);
-#line 3468 "simple-scan.c"
+#line 3793 "simple-scan.c"
 }
 
 
 static void _simple_scan_log_cb_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) {
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_log_cb (log_domain, log_levels, message);
-#line 3475 "simple-scan.c"
+#line 3800 "simple-scan.c"
 }
 
 
@@ -3505,45 +3830,45 @@ gint simple_scan_main (gchar** args, int args_length1) {
 	SimpleScan* _tmp49_ = NULL;
 	gint _tmp50_ = 0;
 	GError * _inner_error_ = NULL;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	setlocale (LC_ALL, "");
-#line 536 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	textdomain (GETTEXT_PACKAGE);
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = _ ("[DEVICE...] - Scanning utility");
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = g_option_context_new (_tmp0_);
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	c = _tmp1_;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = c;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_option_context_add_main_entries (_tmp2_, SIMPLE_SCAN_options, GETTEXT_PACKAGE);
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = c;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = gtk_get_option_group (TRUE);
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_option_context_add_group (_tmp3_, _tmp4_);
-#line 3532 "simple-scan.c"
+#line 3857 "simple-scan.c"
 	{
 		GOptionContext* _tmp5_ = NULL;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = c;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_option_context_parse (_tmp5_, &args_length1, &args, &_inner_error_);
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3541 "simple-scan.c"
-			goto __catch12_g_error;
+#line 3866 "simple-scan.c"
+			goto __catch13_g_error;
 		}
 	}
-	goto __finally12;
-	__catch12_g_error:
+	goto __finally13;
+	__catch13_g_error:
 	{
 		GError* e = NULL;
 		FILE* _tmp6_ = NULL;
@@ -3555,103 +3880,103 @@ gint simple_scan_main (gchar** args, int args_length1) {
 		gint _tmp11__length1 = 0;
 		const gchar* _tmp12_ = NULL;
 		FILE* _tmp13_ = NULL;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = stderr;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp7_ = e;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = _tmp7_->message;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp6_, "%s\n", _tmp8_);
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp9_ = stderr;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp10_ = _ ("Run '%s --help' to see a full list of available command line options.");
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = args;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11__length1 = args_length1;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp12_ = _tmp11_[0];
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp9_, _tmp10_, _tmp12_);
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp13_ = stderr;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp13_, "\n");
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = EXIT_FAILURE;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 3594 "simple-scan.c"
+#line 3919 "simple-scan.c"
 	}
-	__finally12:
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	__finally13:
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return 0;
-#line 3607 "simple-scan.c"
+#line 3932 "simple-scan.c"
 	}
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp14_ = simple_scan_show_version;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp14_) {
-#line 3613 "simple-scan.c"
+#line 3938 "simple-scan.c"
 		FILE* _tmp15_ = NULL;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 639 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp15_ = stderr;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 639 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp15_, "simple-scan %s\n", VERSION);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = EXIT_SUCCESS;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 3625 "simple-scan.c"
+#line 3950 "simple-scan.c"
 	}
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp16_ = simple_scan_fix_pdf_filename;
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp16_ != NULL) {
-#line 3631 "simple-scan.c"
+#line 3956 "simple-scan.c"
 		{
 			const gchar* _tmp17_ = NULL;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp17_ = simple_scan_fix_pdf_filename;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			simple_scan_fix_pdf (_tmp17_, &_inner_error_);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3640 "simple-scan.c"
-				goto __catch13_g_error;
+#line 3965 "simple-scan.c"
+				goto __catch14_g_error;
 			}
 			{
 				gint i = 0;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				i = 1;
-#line 3647 "simple-scan.c"
+#line 3972 "simple-scan.c"
 				{
 					gboolean _tmp18_ = FALSE;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp18_ = TRUE;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					while (TRUE) {
-#line 3654 "simple-scan.c"
+#line 3979 "simple-scan.c"
 						gint _tmp20_ = 0;
 						gchar** _tmp21_ = NULL;
 						gint _tmp21__length1 = 0;
@@ -3659,108 +3984,108 @@ gint simple_scan_main (gchar** args, int args_length1) {
 						gint _tmp22__length1 = 0;
 						gint _tmp23_ = 0;
 						const gchar* _tmp24_ = NULL;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (!_tmp18_) {
-#line 3664 "simple-scan.c"
+#line 3989 "simple-scan.c"
 							gint _tmp19_ = 0;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp19_ = i;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							i = _tmp19_ + 1;
-#line 3670 "simple-scan.c"
+#line 3995 "simple-scan.c"
 						}
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp18_ = FALSE;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp20_ = i;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp21_ = args;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp21__length1 = args_length1;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (!(_tmp20_ < _tmp21__length1)) {
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							break;
-#line 3684 "simple-scan.c"
+#line 4009 "simple-scan.c"
 						}
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp22_ = args;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp22__length1 = args_length1;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp23_ = i;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp24_ = _tmp22_[_tmp23_];
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						simple_scan_fix_pdf (_tmp24_, &_inner_error_);
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3698 "simple-scan.c"
-							goto __catch13_g_error;
+#line 4023 "simple-scan.c"
+							goto __catch14_g_error;
 						}
 					}
 				}
 			}
 		}
-		goto __finally13;
-		__catch13_g_error:
+		goto __finally14;
+		__catch14_g_error:
 		{
 			GError* e = NULL;
 			FILE* _tmp25_ = NULL;
 			GError* _tmp26_ = NULL;
 			const gchar* _tmp27_ = NULL;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			e = _inner_error_;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_inner_error_ = NULL;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp25_ = stderr;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp26_ = e;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp27_ = _tmp26_->message;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			fprintf (_tmp25_, "Error fixing PDF file: %s", _tmp27_);
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			result = EXIT_FAILURE;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_error_free0 (e);
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_option_context_free0 (c);
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			return result;
-#line 3732 "simple-scan.c"
+#line 4057 "simple-scan.c"
 		}
-		__finally13:
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		__finally14:
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_option_context_free0 (c);
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			g_clear_error (&_inner_error_);
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			return 0;
-#line 3745 "simple-scan.c"
+#line 4070 "simple-scan.c"
 		}
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = EXIT_SUCCESS;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 3753 "simple-scan.c"
+#line 4078 "simple-scan.c"
 	}
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	device = NULL;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp28_ = args;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp28__length1 = args_length1;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp28__length1 > 1) {
-#line 3763 "simple-scan.c"
+#line 4088 "simple-scan.c"
 		ScanDevice* _tmp29_ = NULL;
 		ScanDevice* _tmp30_ = NULL;
 		gchar** _tmp31_ = NULL;
@@ -3772,105 +4097,105 @@ gint simple_scan_main (gchar** args, int args_length1) {
 		gint _tmp35__length1 = 0;
 		const gchar* _tmp36_ = NULL;
 		gchar* _tmp37_ = NULL;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp29_ = scan_device_new ();
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_scan_device_unref0 (device);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		device = _tmp29_;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp30_ = device;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp31_ = args;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp31__length1 = args_length1;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp32_ = _tmp31_[1];
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp33_ = g_strdup (_tmp32_);
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (_tmp30_->name);
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp30_->name = _tmp33_;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp34_ = device;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp35_ = args;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp35__length1 = args_length1;
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp36_ = _tmp35_[1];
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp37_ = g_strdup (_tmp36_);
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (_tmp34_->label);
-#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp34_->label = _tmp37_;
-#line 3809 "simple-scan.c"
+#line 4134 "simple-scan.c"
 	}
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 667 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp38_ = g_timer_new ();
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 667 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_timer_destroy0 (simple_scan_log_timer);
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 667 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_log_timer = _tmp38_;
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp39_ = g_get_user_cache_dir ();
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp40_ = g_build_filename (_tmp39_, "simple-scan", NULL, NULL);
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	path = _tmp40_;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp41_ = path;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_mkdir_with_parents (_tmp41_, 0700);
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 670 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp42_ = g_get_user_cache_dir ();
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 670 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp43_ = g_build_filename (_tmp42_, "simple-scan", "simple-scan.log", NULL, NULL);
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 670 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (path);
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 670 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	path = _tmp43_;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp44_ = path;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp45_ = g_fopen (_tmp44_, "w");
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_fclose0 (simple_scan_log_file);
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_log_file = _tmp45_;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_log_set_default_handler (_simple_scan_log_cb_glog_func, NULL);
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp46_ = getpid ();
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:594: Starting Simple Scan %s, PID=%i", VERSION, (gint) _tmp46_);
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	g_debug ("simple-scan.vala:674: Starting Simple Scan %s, PID=%i", VERSION, (gint) _tmp46_);
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	gtk_init (&args_length1, &args);
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp47_ = device;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp48_ = simple_scan_new (_tmp47_);
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	app = _tmp48_;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp49_ = app;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp50_ = g_application_run ((GApplication*) _tmp49_, 0, NULL);
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	result = _tmp50_;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (app);
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (path);
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_scan_device_unref0 (device);
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_option_context_free0 (c);
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
-#line 3873 "simple-scan.c"
+#line 4198 "simple-scan.c"
 }
 
 
@@ -3878,9 +4203,9 @@ int main (int argc, char ** argv) {
 #if !GLIB_CHECK_VERSION (2,35,0)
 	g_type_init ();
 #endif
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return simple_scan_main (argv, argc);
-#line 3883 "simple-scan.c"
+#line 4208 "simple-scan.c"
 }
 
 
@@ -3897,7 +4222,7 @@ static void simple_scan_class_init (SimpleScanClass * klass) {
 	((GApplicationClass *) klass)->shutdown = simple_scan_real_shutdown;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_OBJECT_CLASS (klass)->finalize = simple_scan_finalize;
-#line 3900 "simple-scan.c"
+#line 4225 "simple-scan.c"
 }
 
 
@@ -3908,7 +4233,7 @@ static void simple_scan_instance_init (SimpleScan * self) {
 	self->priv->default_device = NULL;
 #line 33 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->have_devices = FALSE;
-#line 3911 "simple-scan.c"
+#line 4236 "simple-scan.c"
 }
 
 
@@ -3919,7 +4244,7 @@ static void simple_scan_finalize (GObject* obj) {
 #line 32 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_scan_device_unref0 (self->priv->default_device);
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_object_unref0 (self->priv->udev_client);
+	_g_object_unref0 (self->priv->usb_context);
 #line 35 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (self->priv->ui);
 #line 36 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -3928,7 +4253,7 @@ static void simple_scan_finalize (GObject* obj) {
 	_book_unref0 (self->priv->book);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_OBJECT_CLASS (simple_scan_parent_class)->finalize (obj);
-#line 3931 "simple-scan.c"
+#line 4256 "simple-scan.c"
 }
 
 
@@ -3944,22 +4269,4 @@ GType simple_scan_get_type (void) {
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	if ((array != NULL) && (destroy_func != NULL)) {
-		int i;
-		for (i = 0; i < array_length; i = i + 1) {
-			if (((gpointer*) array)[i] != NULL) {
-				destroy_func (((gpointer*) array)[i]);
-			}
-		}
-	}
-}
-
-
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	_vala_array_destroy (array, array_length, destroy_func);
-	g_free (array);
-}
-
-
 
diff --git a/src/simple-scan.vala b/src/simple-scan.vala
index eaa8b59..19dd8a2 100644
--- a/src/simple-scan.vala
+++ b/src/simple-scan.vala
@@ -31,7 +31,7 @@ public class SimpleScan : Gtk.Application
 
     private ScanDevice? default_device = null;
     private bool have_devices = false;
-    private GUdev.Client udev_client;
+    private GUsb.Context usb_context;
     private UserInterface ui;
     private Scanner scanner;
     private Book book;
@@ -62,9 +62,16 @@ public class SimpleScan : Gtk.Application
         scanner.scan_failed.connect (scanner_failed_cb);
         scanner.scanning_changed.connect (scanner_scanning_changed_cb);
 
-        string[]? subsystems = { "usb", null };
-        udev_client = new GUdev.Client (subsystems);
-        udev_client.uevent.connect (on_uevent);
+        try
+        {
+            usb_context = new GUsb.Context ();
+            usb_context.device_added.connect (() => { scanner.redetect (); });
+            usb_context.device_removed.connect (() => { scanner.redetect (); });
+        }
+        catch (Error e)
+        {
+            warning ("Failed to create USB context: %s\n", e.message);
+        }
 
         if (default_device != null)
         {
@@ -88,7 +95,7 @@ public class SimpleScan : Gtk.Application
         base.shutdown ();
         book = null;
         ui = null;
-        udev_client = null;
+        usb_context = null;
         scanner.free ();
     }
 
@@ -114,9 +121,96 @@ public class SimpleScan : Gtk.Application
         }
 
         have_devices = devices_copy.length () > 0;
-        ui.set_scan_devices (devices_copy);
+
+        /* If SANE doesn't see anything, see if we recognise any of the USB devices */
+        string? missing_driver = null;
+        if (!have_devices)
+            missing_driver = suggest_driver ();
+
+        ui.set_scan_devices (devices_copy, missing_driver);
+    }
+    
+    /* Taken from /usr/local/Brother/sane/Brsane.ini from brscan driver */
+    private const uint32 brscan_devices[] = { 0x04f90110, 0x04f90111, 0x04f90112, 0x04f9011d, 0x04f9011e, 0x04f9011f, 0x04f9012b, 0x04f90124, 0x04f90153, 0x04f90125, 0x04f90113, 0x04f90114, 0x04f90115, 0x04f90116, 0x04f90119, 0x04f9011a, 0x04f9011b, 0x04f9011c, 0x04f9012e, 0x04f9012f, 0x04f90130, 0x04f90128, 0x04f90127, 0x04f90142, 0x04f90143, 0x04f90140, 0x04f90141, 0x04f9014e, 0x04f9014f, 0x04f90150, 0x04f90151, 0x04f9010e, 0x04f9013a, 0x04f90120, 0x04f9010f, 0x04f90121, 0x04f90122, 0x04f90132, 0x04f9013d, 0x04f9013c, 0x04f90136, 0x04f90135, 0x04f9013e, 0x04f9013f, 0x04f90144, 0x04f90146, 0x04f90148, 0x04f9014a, 0x04f9014b, 0x04f9014c, 0x04f90157, 0x04f90158, 0x04f9015d, 0x04f9015e, 0x04f9015f, 0x04f90160 };
+
+    /* Taken from /usr/local/Brother/sane/models2/*.ini from brscan2 driver */
+    private const uint32 brscan2_devices[] = { 0x04f901c9, 0x04f901ca, 0x04f901cb, 0x04f901cc, 0x04f901ec, 0x04f901e4, 0x04f901e3, 0x04f901e2, 0x04f901e1, 0x04f901e0, 0x04f901df, 0x04f901de, 0x04f901dd, 0x04f901dc, 0x04f901db, 0x04f901da, 0x04f901d9, 0x04f901d8, 0x04f901d7, 0x04f901d6, 0x04f901d5, 0x04f901d4, 0x04f901d3, 0x04f901d2, 0x04f901d1, 0x04f901d0, 0x04f901cf, 0x04f901ce, 0x04f9020d, 0x04f9020c, 0x04f9020a };
+
+    /* Taken from /usr/local/Brother/sane/models3/*.ini from brscan3 driver */
+    private const uint32 brscan3_devices[] = { 0x04f90222, 0x04f90223, 0x04f90224, 0x04f90225, 0x04f90229, 0x04f9022a, 0x04f9022c, 0x04f90228, 0x04f90236, 0x04f90227, 0x04f9022b, 0x04f9022d, 0x04f9022e, 0x04f9022f, 0x04f90230, 0x04f9021b, 0x04f9021a, 0x04f90219, 0x04f9023f, 0x04f90216, 0x04f9021d, 0x04f9021c, 0x04f90220, 0x04f9021e, 0x04f9023e, 0x04f90235, 0x04f9023a, 0x04f901c9, 0x04f901ca, 0x04f901cb, 0x04f901cc, 0x04f901ec, 0x04f9020d, 0x04f9020c, 0x04f90257, 0x04f9025d, 0x04f90254, 0x04f9025b, 0x04f9026b, 0x04f90258, 0x04f9025e, 0x04f90256, 0x04f90240, 0x04f9025f, 0x04f90260, 0x04f90261, 0x04f90278, 0x04f9026f, 0x04f9026e, 0x04f9026d, 0x04f90234, 0x04f90239, 0x04f90253, 0x04f90255, 0x04f90259, 0x04f9025a, 0x04f9025c, 0x04f90276 };
+
+    /* Taken from /opt/brother/scanner/brscan4/models4/*.ini from brscan4 driver */
+    private const uint32 brscan4_devices[] = { 0x04f90314, 0x04f90313, 0x04f90312, 0x04f90311, 0x04f90310, 0x04f9030f, 0x04f90366, 0x04f90365, 0x04f90364, 0x04f90350, 0x04f9034f, 0x04f9034e, 0x04f9034b, 0x04f90349, 0x04f90347, 0x04f90346, 0x04f90343, 0x04f90342, 0x04f90341, 0x04f90340, 0x04f9033d, 0x04f9033c, 0x04f9033a, 0x04f90339, 0x04f90392, 0x04f90373, 0x04f9036e, 0x04f9036d, 0x04f9036c, 0x04f9036b, 0x04f9036a, 0x04f90369, 0x04f90368, 0x04f90367, 0x04f90338, 0x04f90337, 0x04f90335, 0x04f90331, 0x04f90330, 0x04f90329, 0x04f90328, 0x04f90326, 0x04f90324, 0x04f90322, 0x04f90321, 0x04f90320, 0x04f90372, 0x04f90371, 0x04f90370, 0x04f9036f, 0x04f90361, 0x04f90360, 0x04f9035e, 0x04f9035d, 0x04f9035c, 0x04f9035b, 0x04f90379, 0x04f90378, 0x04f90376, 0x04f9037a, 0x04f9037b, 0x04f90377, 0x04f9037f, 0x04f9037e, 0x04f9037d, 0x04f9037c, 0x04f9035a, 0x04f90359, 0x04f90358, 0x04f90357, 0x04f90356, 0x04f90355, 0x04f90354, 0x04f90353, 0x04f90351, 0x04f90390, 0x04f903b3, 0x04f90396, 0x04f90395, 0x04f90394, 0x04f90393, 0x04f90380, 0x04f90381, 0x04f903bd, 0x04f90383, 0x04f90397, 0x04f90386, 0x04f90384, 0x04f90385, 0x04f90388, 0x04f90389, 0x04f9038b, 0x04f9038a, 0x04f9038c, 0x04f9038e, 0x04f9038f, 0x04f9038d, 0x04f903bc, 0x04f903bb, 0x04f903b6, 0x04f903b5, 0x04f903b4, 0x04f90290, 0x04f9028f, 0x04f9028d, 0x04f9028a, 0x04f90284, 0x04f90283, 0x04f90282, 0x04f90281, 0x04f9027e, 0x04f9027d, 0x04f9027c, 0x04f9027b, 0x04f90280, 0x04f9027a, 0x04f90279, 0x04f9027f, 0x04f90285, 0x04f9029a, 0x04f9029f, 0x04f9029e, 0x04f90289, 0x04f90288, 0x04f960a0, 0x04f960a1, 0x04f90293, 0x04f902b7, 0x04f90294, 0x04f90296, 0x04f90298, 0x04f902ba, 0x04f90299, 0x04f902bb, 0x04f902d4, 0x04f90291, 0x04f902ac, 0x04f902b5, 0x04f90292, 0x04f902b6, 0x04f90295, 0x04f902b8, 0x04f9029c, 0x04f902cb, 0x04f902ca, 0x04f902a6, 0x04f902a7, 0x04f902ab, 0x04f902a5, 0x04f902a8, 0x04f902a0, 0x04f902c1, 0x04f902c0, 0x04f902bf, 0x04f902be, 0x04f902bd, 0x04f902bc, 0x04f902b2, 0x04f90287, 0x04f902cf, 0x04f902ce, 0x04f902cd, 0x04f902c7, 0x04f902c6, 0x04f902c5, 0x04f902c4, 0x04f902b4, 0x04f902b3, 0x04f902c2, 0x04f960a4, 0x04f960a5, 0x04f902cc, 0x04f902c8, 0x04f902c3, 0x04f902d3, 0x04f902b1, 0x04f902b0, 0x04f902af, 0x04f902ae, 0x04f902ad, 0x04f902d1, 0x04f902d0, 0x04f902fb, 0x04f902f1, 0x04f902f0, 0x04f902ef, 0x04f902ed, 0x04f902ec, 0x04f902ee, 0x04f902eb, 0x04f902e9, 0x04f902e8, 0x04f902fa, 0x04f902ea, 0x04f902e6, 0x04f902e5, 0x04f902e4, 0x04f902e3, 0x04f902e2, 0x04f902f9, 0x04f902de, 0x04f902e0, 0x04f902df, 0x04f902e1, 0x04f902e7, 0x04f902fc, 0x04f902fd, 0x04f902fe, 0x04f902dd, 0x04f902c9, 0x04f902ff, 0x04f90300, 0x04f902f2, 0x04f902f3, 0x04f902f4, 0x04f902f8, 0x04f902f5, 0x04f902f6, 0x04f902f7, 0x04f90318, 0x04f960a6, 0x04f960a7, 0x04f960a8, 0x04f960a9 }; 
+
+    /* Taken from uld/noarch/oem.conf in the Samsung SANE driver */
+    private const uint32 samsung_devices[] = { 0x04e83425, 0x04e8341c, 0x04e8342a, 0x04e8343d, 0x04e83456, 0x04e8345a, 0x04e83427, 0x04e8343a, 0x04e83428, 0x04e8343b, 0x04e83455, 0x04e83421, 0x04e83439, 0x04e83444, 0x04e8343f, 0x04e8344e, 0x04e83431, 0x04e8345c, 0x04e8344d, 0x04e83462, 0x04e83464, 0x04e83461, 0x04e83460, 0x04e8340e, 0x04e83435, 0x04e8340f, 0x04e83441, 0x04e8344f, 0x04e83413, 0x04e8341b, 0x04e8342e, 0x04e83426, 0x04e8342b, 0x04e83433, 0x04e83440, 0x04e83434, 0x04e8345b, 0x04e83457, 0x04e8341f, 0x04e83453, 0x04e8344b, 0x04e83409, 0x04e83412, 0x04e83419, 0x04e8342c, 0x04e8343c, 0x04e83432, 0x04e8342d, 0x04e83430, 0x04e8342f, 0x04e83446, 0x04e8341a, 0x04e83437, 0x04e83442, 0x04e83466, 0x04e8340d, 0x04e8341d, 0x04e83420, 0x04e83429, 0x04e83443, 0x04e83438, 0x04e8344c, 0x04e8345d, 0x04e83463, 0x04e83465, 0x04e83450, 0x04e83468, 0x04e83469, 0x04e83471 };
+
+    /* Taken from /usr/share/hplip/data/models/models.dat in the HPAIO driver */
+    private const uint32 hpaio_devices[] = { 0x03f02311, 0x03f09711, 0x03f01311, 0x03f01011, 0x03f00f11, 0x03f01911, 0x03f00011, 0x03f00111, 0x03f00611, 0x03f00511, 0x03f00811, 0x03f00711, 0x03f00211, 0x03f00311, 0x03f00411, 0x03f0062a, 0x03f04912, 0x03f09911, 0x03f03802, 0x03f07a11, 0x03f08311, 0x03f07b11, 0x03f0a711, 0x03f08d11, 0x03f08a11, 0x03f0bb11, 0x03f0222a, 0x03f0322a, 0x03f03902, 0x03f01002, 0x03f0242a, 0x03f0332a, 0x03f0122a, 0x03f00c2a, 0x03f0132a, 0x03f02c2a, 0x03f07e11, 0x03f07811, 0x03f08e11, 0x03f02d2a, 0x03f03502, 0x03f01102, 0x03f06112, 0x03f06212, 0x03f05511, 0x03f00f2a, 0x03f0082a, 0x03f07311, 0x03f07c11, 0x03f07d11, 0x03f01d02, 0x03f01202, 0x03f01e02, 0x03f01602, 0x03f01302, 0x03f01702, 0x03f0152a, 0x03f0142a, 0x03f09611, 0x03f01502, 0x03f01902, 0x03f01f02, 0x03f00512, 0x03f0aa11, 0x03f0a311, 0x03f01312, 0x03f01802, 0x03f02812, 0x03f0bf11, 0x03f0c011, 0x03f0342a, 0x03f09e17, 0x03f09f17, 0x03f0252a, 0x03f0a417, 0x03f01a02, 0x03f09e11, 0x03f09011, 0x03f02602, 0x03f0272a, 0x03f02b02, 0x03f01812, 0x03f0b211, 0x03f0352a, 0x03f02b2a, 0x03f0362a, 0x03f0a517, 0x03f01b02, 0x03f02702, 0x03f02c02, 0x03f0282a, 0x03f02104, 0x03f0432a, 0x03f02004, 0x03f01a2a, 0x03f02304, 0x03f01b2a, 0x03f0442a, 0x03f08904, 0x03f0a617, 0x03f09a17, 0x03f0312a, 0x03f0452a, 0x03f01c02, 0x03f01811, 0x03f09d17, 0x03f02804, 0x03f02904, 0x03f01511, 0x03f01411, 0x03f0372a, 0x03f00d14, 0x03f01611, 0x03f01711, 0x03f00f14, 0x03f01f2a, 0x03f00304, 0x03f00204, 0x03f00804, 0x03f02902, 0x03f00704, 0x03f01e2a, 0x03f00404, 0x03f00604, 0x03f00904, 0x03f01512, 0x03f01c2a, 0x03f00104, 0x03f01d2a, 0x03f00004, 0x03f02604, 0x03f02704, 0x03f01804, 0x03f01504, 0x03f01f11, 0x03f01204, 0x03f01604, 0x03f01704, 0x03f01104, 0x03f01e11, 0x03f01304, 0x03f01404, 0x03f03104, 0x03f01004, 0x03f03004, 0x03f03304, 0x03f05004, 0x03f01712, 0x03f02e11, 0x03f00517, 0x03f08811, 0x03f01317, 0x03f04117, 0x03f03217, 0x03f03e17, 0x03f00c17, 0x03f0b511, 0x03f04217, 0x03f04317, 0x03f02b17, 0x03f03017, 0x03f02d17, 0x03f02c17, 0x03f00b2a, 0x03f0112a, 0x03f08911, 0x03f07c04, 0x03f00912, 0x03f03011, 0x03f0032a, 0x03f0002a, 0x03f0102a, 0x03f03402, 0x03f05617, 0x03f05717, 0x03f0042a, 0x03f00f17, 0x03f04004, 0x03f01017, 0x03f01e17, 0x03f00317, 0x03f00f12, 0x03f02f11, 0x03f0052a, 0x03f04717, 0x03f03202, 0x03f00e2a, 0x03f0262a, 0x03f03302, 0x03f00417, 0x03f00212, 0x03f01412, 0x03f07804, 0x03f03b11, 0x03f01117, 0x03f03f11, 0x03f04f17, 0x03f04e17, 0x03f03602, 0x03f05817, 0x03f01d17, 0x03f03c11, 0x03f07904, 0x03f04d11, 0x03f0072a, 0x03f01417, 0x03f04c11, 0x03f0c111, 0x03f04417, 0x03f05017, 0x03f0022a, 0x03f0012a, 0x03f0092a, 0x03f07f11, 0x03f04811, 0x03f03a17, 0x03f00a2a, 0x03f00312, 0x03f09411, 0x03f09b11, 0x03f03917, 0x03f04a17, 0x03f03817, 0x03f0b911, 0x03f05417, 0x03f05217, 0x03f05317, 0x03f05d17, 0x03f08711, 0x03f05c17, 0x03f09a11, 0x03f02811, 0x03f07d04, 0x03f02a11, 0x03f02b11, 0x03f00217, 0x03f02911, 0x03f02404, 0x03f03511, 0x03f00812, 0x03f00b17, 0x03f0c302, 0x03f05917, 0x03f05a17, 0x03f05b17, 0x03f04911, 0x03f03611, 0x03f07611, 0x03f07a04, 0x03f02517, 0x03f02917, 0x03f02a17, 0x03f01e04, 0x03f00717, 0x03f02504, 0x03f03711, 0x03f0ac11, 0x03f0be11, 0x03f0c211, 0x03f01c17, 0x03f04e11, 0x03f02e17, 0x03f04511, 0x03f08011, 0x03f00412, 0x03f03617, 0x03f02f17, 0x03f03117, 0x03f0c911, 0x03f0ca11, 0x03f04611, 0x03f03c17, 0x03f03717, 0x03f02617, 0x03f01112, 0x03f00612, 0x03f06717, 0x03f09511, 0x03f07617, 0x03f07317, 0x03f08d17, 0x03f01617, 0x03f07a17, 0x03f07517, 0x03f09311, 0x03f0a011, 0x03f03317, 0x03f03417, 0x03f0a211, 0x03f05611, 0x03f05011, 0x03f00117, 0x03f05111, 0x03f00817, 0x03f05211, 0x03f07004, 0x03f00917, 0x03f01917, 0x03f03517, 0x03f07104, 0x03f01517, 0x03f03112, 0x03f07817, 0x03f0ad11, 0x03f0b011, 0x03f08517, 0x03f08a17, 0x03f0c711, 0x03f06117, 0x03f06917, 0x03f06812, 0x03f06d12, 0x03f07204, 0x03f00a17, 0x03f07404, 0x03f06817, 0x03f01b04, 0x03f01a04, 0x03f01c04, 0x03f01904, 0x03f07504, 0x03f07604, 0x03f00714, 0x03f09c11, 0x03f07b17, 0x03f08817, 0x03f05711, 0x03f07704, 0x03f07e04, 0x03f03111, 0x03f06017, 0x03f03d11, 0x03f05c11, 0x03f07b04, 0x03f06a17, 0x03f02417, 0x03f05411, 0x03f01f04, 0x03f06711, 0x03f07417, 0x03f09717, 0x03f02317, 0x03f06611, 0x03f06c11, 0x03f09d11, 0x03f07711, 0x03f04712, 0x03f08c11, 0x03f05712, 0x03f02a12, 0x03f06b11, 0x03f0c511, 0x03f02e12, 0x03f0c411, 0x03f09917, 0x03f09c17, 0x03f07411, 0x03f06c17, 0x03f05812, 0x03f06512, 0x03f06612, 0x03f06412, 0x03f0c611, 0x03f0c811, 0x03f01a17, 0x03f02b12, 0x03f02c12, 0x03f07511, 0x03f06217, 0x03f07d17, 0x03f06317, 0x03f07917, 0x03f07217, 0x03f0a117, 0x03f0c802, 0x03f05811, 0x03f0c402, 0x03f02411, 0x03f05d11, 0x03f06417, 0x03f06617, 0x03f08917, 0x03f05117, 0x03f07111, 0x03f01f12, 0x03f06811, 0x03f02012, 0x03f08604, 0x03f06d11, 0x03f03a11, 0x03f03012, 0x03f08211, 0x03f07211, 0x03f0a111, 0x03f0b411, 0x03f09b17, 0x03f0b111, 0x03f0b611, 0x03f0c311, 0x03f01f17, 0x03f06004, 0x03f04f11, 0x03f0cc11, 0x03f06104, 0x03f05b11, 0x03f08104, 0x03f0cd11, 0x03f0a004, 0x03f08704, 0x03f04312, 0x03f04212, 0x03f06f17, 0x03f07c17, 0x03f09517, 0x03f05911, 0x03f05e12, 0x03f00b14, 0x03f0c502, 0x03f02d11, 0x03f03404, 0x03f04b11, 0x03f01014, 0x03f06a11, 0x03f07312, 0x03f07011, 0x03f05311, 0x03f03312, 0x03f04412, 0x03f05412, 0x03f05512, 0x03f04512, 0x03f08204, 0x03f0a511, 0x03f0af11, 0x03f0ba11, 0x03f08504, 0x03f05d12, 0x03f05c12, 0x03f08404, 0x03f07412, 0x03f07212, 0x03f08804, 0x03f04612, 0x03f02611, 0x03f05a11, 0x03f02612, 0x03f0c602, 0x03f06012, 0x03f03a02, 0x03f06911, 0x03f0b002, 0x03f04111, 0x03f06511, 0x03f04211, 0x03f02512, 0x03f0c702, 0x03f02002, 0x03f03c02, 0x03f04311, 0x03f0b802, 0x03f05e11, 0x03f03412, 0x03f02112, 0x03f04812, 0x03f06f11, 0x03f0a611, 0x03f0bc11, 0x03f03e02, 0x03f02212, 0x03f0b202, 0x03f06e12, 0x03f0dc11, 0x03f02312, 0x03f0b402, 0x03f0c002, 0x03f0b602, 0x03f05612, 0x03f03612, 0x03f0c102, 0x03f0de11, 0x03f07717, 0x03f07117, 0x03f05b12, 0x03f06411, 0x03f0ba02, 0x03f0c202, 0x03f0be02, 0x03f0bb02, 0x03f03812, 0x03f04012, 0x03f03912, 0x03f0d102, 0x03f05312, 0x03f02712, 0x03f05912, 0x03f07112, 0x03f07012, 0x03f06f12, 0x03f07712, 0x03f07612, 0x03f0bc02, 0x03f0d002, 0x03f08417, 0x03f02017, 0x03f02117, 0x03f08317, 0x03f09617, 0x03f00d12, 0x03f0bd02, 0x03f02217, 0x03f00b12, 0x03f01212, 0x03f03c2a, 0x03f0382a, 0x03f0582a, 0x03f0552a, 0x03f03e2a, 0x03f03f2a, 0x03f0e311, 0x03f0e111 };
+
+    /* Taken from epkowa.desc from iscan-data package for Epson driver */
+    private const uint32 epkowa_devices[] = { 0x04b80101, 0x04b80102, 0x04b80103, 0x04b80104, 0x04b80105, 0x04b80106, 0x04b80107, 0x04b80108, 0x04b80109, 0x04b8010a, 0x04b8010b, 0x04b8010c, 0x04b8010d, 0x04b8010e, 0x04b8010f, 0x04b80110, 0x04b80112, 0x04b80114, 0x04b80116, 0x04b80118, 0x04b80119, 0x04b8011a, 0x04b8011b, 0x04b8011c, 0x04b8011d, 0x04b8011e, 0x04b8011f, 0x04b80120, 0x04b80121, 0x04b80122, 0x04b80126, 0x04b80128, 0x04b80129, 0x04b8012a, 0x04b8012b, 0x04b8012c, 0x04b8012d, 0x04b8012e, 0x04b8012f, 0x04b80130, 0x04b80131, 0x04b80133, 0x04b80135, 0x04b80136, 0x04b80137, 0x04b80138, 0x04b8013a, 0x04b8013b, 0x04b8013c, 0x04b8013d, 0x04b80142, 0x04b80143, 0x04b80144, 0x04b80147, 0x04b8014a, 0x04b8014b, 0x04b80151, 0x04b80153, 0x04b80801, 0x04b80802, 0x04b80805, 0x04b80806, 0x04b80807, 0x04b80808, 0x04b8080a, 0x04b8080c, 0x04b8080d, 0x04b8080e, 0x04b8080f, 0x04b80810, 0x04b80811, 0x04b80813, 0x04b80814, 0x04b80815, 0x04b80817, 0x04b80818, 0x04b80819, 0x04b8081a, 0x04b8081c, 0x04b8081d, 0x04b8081f, 0x04b80820, 0x04b80821, 0x04b80827, 0x04b80828, 0x04b80829, 0x04b8082a, 0x04b8082b, 0x04b8082e, 0x04b8082f, 0x04b80830, 0x04b80831, 0x04b80833, 0x04b80834, 0x04b80835, 0x04b80836, 0x04b80837, 0x04b80838, 0x04b80839, 0x04b8083a, 0x04b8083c, 0x04b8083f, 0x04b80841, 0x04b80843, 0x04b80844, 0x04b80846, 0x04b80847, 0x04b80848, 0x04b80849, 0x04b8084a, 0x04b8084c, 0x04b8084d, 0x04b8084f, 0x04b80850, 0x04b80851, 0x04b80852, 0x04b80853, 0x04b80854, 0x04b80855, 0x04b80856, 0x04b8085c, 0x04b8085d, 0x04b8085e, 0x04b8085f, 0x04b80860, 0x04b80861, 0x04b80862, 0x04b80863, 0x04b80864, 0x04b80865, 0x04b80866, 0x04b80869, 0x04b8086a, 0x04b80870, 0x04b80871, 0x04b80872, 0x04b80873, 0x04b80878, 0x04b80879, 0x04b8087b, 0x04b8087c, 0x04b8087d, 0x04b8087e, 0x04b8087f, 0x04b80880, 0x04b80881, 0x04b80883, 0x04b80884, 0x04b80885, 0x04b8088f, 0x04b80890, 0x04b80891, 0x04b80892, 0x04b80893, 0x04b80894, 0x04b80895, 0x04b80896, 0x04b80897, 0x04b80898, 0x04b80899, 0x04b8089a, 0x04b8089b, 0x04b8089c, 0x04b8089d, 0x04b8089e, 0x04b8089f, 0x04b808a0, 0x04b808a1, 0x04b808a5, 0x04b808a6, 0x04b808a8, 0x04b808a9, 0x04b808aa, 0x04b808ab, 0x04b808ac, 0x04b808ad, 0x04b808ae, 0x04b808af, 0x04b808b0, 0x04b808b3, 0x04b808b4, 0x04b808b5, 0x04b808b6, 0x04b808b7, 0x04b808b8, 0x04b808b9, 0x04b808bd, 0x04b808be, 0x04b808bf, 0x04b808c0, 0x04b808c1, 0x04b808c3, 0x04b808c4, 0x04b808c5, 0x04b808c6, 0x04b808c7, 0x04b808c8, 0x04b808c9, 0x04b808ca, 0x04b808cd, 0x04b808d0 };
+
+    /* Brother IDs extracted using the following Python
+     * import sys   
+     * ids = []
+     * for f in sys.argv:
+     *   for l in file (f).readlines ():
+     *     tokens = l.strip().split (',')
+     *     if len (tokens) >= 4:
+     *         ids.append ('0x%08x' % (0x04f9 << 16 | int (tokens[0], 16)))
+     * print ('{ ' + ', '.join (ids) + ' }')
+     */
+
+    /* HPAIO IDs extraced using the following Python:
+     * import sys
+     * ids = []
+     * for f in sys.argv:
+     *   for l in file (f).readlines ():
+     *   if not l.startswith ('usb-pid='):
+     *     continue
+     *   pid = int (l[8:].strip (), 16)
+     *   if pid == 0:
+     *     continue
+     *   usb_id = '0x%08x' % (0x04f9 << 16 | pid)
+     *   if not usb_id in ids:
+     *     ids.append (usb_id)
+     * print ('{ ' + ', '.join (ids) + ' }')
+     */
+
+    public string? suggest_driver ()
+    {
+        if (usb_context == null)
+            return null;
+
+        var driver_map = new HashTable <uint32, string> (direct_hash, direct_equal);
+        add_devices (driver_map, brscan_devices, "brscan");
+        add_devices (driver_map, brscan2_devices, "brscan2");
+        add_devices (driver_map, brscan3_devices, "brscan3");
+        add_devices (driver_map, brscan4_devices, "brscan4");
+        add_devices (driver_map, samsung_devices, "samsung");
+        add_devices (driver_map, hpaio_devices, "hpaio");
+        add_devices (driver_map, epkowa_devices, "epkowa");        
+        var devices = GUsb.context_get_devices (usb_context);
+        /* Fixed in GUsb 0.2.7: https://github.com/hughsie/libgusb/commit/83a6b1a20653c1a17f0a909f08652b5e1df44075 */
+        /*var devices = GUSB.context_get_devices (context);*/
+        for (var i = 0; i < devices.length; i++)
+        {
+            var device = devices.data[i];
+            var driver = driver_map.lookup (device.get_vid () << 16 | device.get_pid ());
+            if (driver != null)
+                return driver;
+        }
+
+        return null;
     }
 
+    private void add_devices (HashTable<uint32, string> map, uint32[] devices, string driver)
+    {
+        for (var i = 0; i < devices.length; i++)
+            map.insert (devices[i], driver);
+    }   
+
     private void authorize_cb (Scanner scanner, string resource)
     {
         string username, password;
@@ -312,15 +406,6 @@ public class SimpleScan : Gtk.Application
         if (!scanner.is_scanning ())
             append_page ();
 
-        /* Default filename to use when saving document (and extension will be added, e.g. .jpg) */
-        string filename_prefix = _("Scanned Document");
-        string extension;
-        if (options.scan_mode == ScanMode.COLOR)
-            extension = "jpg";
-        else
-            extension = "pdf";
-        var filename = "%s.%s".printf (filename_prefix, extension);
-        ui.default_file_name = filename;
         scanner.scan (device, options);
     }
 
@@ -450,11 +535,6 @@ public class SimpleScan : Gtk.Application
             stderr.printf ("[%+.2fs] %s %s\n", log_timer.elapsed (), prefix, message);
     }
 
-    private void on_uevent (GUdev.Client client, string action, GUdev.Device device)
-    {
-        scanner.redetect ();
-    }
-
     private static void fix_pdf (string filename) throws Error
     {
         uint8[] data;
diff --git a/src/ui.c b/src/ui.c
index 917edd3..a938838 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -25,6 +25,7 @@
 #include <math.h>
 #include <cairo.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include "packagekit-glib2/packagekit.h"
 #include <glib/gstdio.h>
 #include <unistd.h>
 
@@ -108,6 +109,7 @@ typedef struct _ScanDevice ScanDevice;
 typedef struct _ScanDeviceClass ScanDeviceClass;
 typedef struct _ScanDevicePrivate ScanDevicePrivate;
 #define _scan_device_unref0(var) ((var == NULL) ? NULL : (var = (scan_device_unref (var), NULL)))
+typedef struct _Block1Data Block1Data;
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 #define TYPE_SCAN_TYPE (scan_type_get_type ())
@@ -125,7 +127,7 @@ typedef struct _ScanOptionsClass ScanOptionsClass;
 #define TYPE_SCAN_MODE (scan_mode_get_type ())
 typedef struct _ScanOptionsPrivate ScanOptionsPrivate;
 #define _scan_options_unref0(var) ((var == NULL) ? NULL : (var = (scan_options_unref (var), NULL)))
-typedef struct _Block1Data Block1Data;
+typedef struct _Block2Data Block2Data;
 
 #define TYPE_PAGE_ICON (page_icon_get_type ())
 #define PAGE_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_ICON, PageIcon))
@@ -137,6 +139,9 @@ typedef struct _Block1Data Block1Data;
 typedef struct _PageIcon PageIcon;
 typedef struct _PageIconClass PageIconClass;
 #define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL)))
+typedef struct _Block3Data Block3Data;
+#define _g_ptr_array_unref0(var) ((var == NULL) ? NULL : (var = (g_ptr_array_unref (var), NULL)))
+typedef struct _UserInterfaceInstallPackagesData UserInterfaceInstallPackagesData;
 #define _g_key_file_unref0(var) ((var == NULL) ? NULL : (var = (g_key_file_unref (var), NULL)))
 typedef struct _ProgressBarDialogPrivate ProgressBarDialogPrivate;
 typedef struct _PageIconPrivate PageIconPrivate;
@@ -168,6 +173,7 @@ struct _UserInterfacePrivate {
 	GtkLabel* info_bar_label;
 	GtkButton* info_bar_close_button;
 	GtkButton* info_bar_change_scanner_button;
+	GtkButton* info_bar_install_button;
 	GtkRadioMenuItem* custom_crop_menuitem;
 	GtkRadioMenuItem* a4_menuitem;
 	GtkRadioMenuItem* a5_menuitem;
@@ -219,6 +225,7 @@ struct _UserInterfacePrivate {
 	GtkAdjustment* contrast_adjustment;
 	GtkAdjustment* quality_adjustment;
 	gboolean setting_devices;
+	gchar* missing_driver;
 	gboolean user_selected_device;
 	GtkFileChooserDialog* save_dialog;
 	ProgressBarDialog* progress_dialog;
@@ -236,7 +243,6 @@ struct _UserInterfacePrivate {
 	gint default_page_dpi;
 	ScanDirection default_page_scan_direction;
 	gchar* document_hint;
-	gchar* _default_file_name;
 	gboolean scanning_;
 	gint window_width;
 	gint window_height;
@@ -257,6 +263,13 @@ struct _ScanDeviceClass {
 	void (*finalize) (ScanDevice *self);
 };
 
+struct _Block1Data {
+	int _ref_count_;
+	UserInterface* self;
+	GtkListStore* file_type_store;
+	GtkComboBox* file_type_combo;
+};
+
 typedef enum  {
 	SCAN_TYPE_SINGLE,
 	SCAN_TYPE_ADF_FRONT,
@@ -290,12 +303,93 @@ struct _ScanOptionsClass {
 	void (*finalize) (ScanOptions *self);
 };
 
-struct _Block1Data {
+struct _Block2Data {
 	int _ref_count_;
 	UserInterface* self;
 	GtkWindow* dialog;
 };
 
+struct _Block3Data {
+	int _ref_count_;
+	UserInterface* self;
+	GtkStack* stack;
+	GtkSpinner* spinner;
+	GtkLabel* status_label;
+	GtkLabel* instructions_label;
+};
+
+struct _UserInterfaceInstallPackagesData {
+	int _state_;
+	GObject* _source_object_;
+	GAsyncResult* _res_;
+	GSimpleAsyncResult* _async_result;
+	UserInterface* self;
+	gchar** packages;
+	gint packages_length1;
+	PkProgressCallback progress_callback;
+	gpointer progress_callback_target;
+	PkResults* result;
+	PkTask* task;
+	PkTask* _tmp0_;
+	PkResults* results;
+	PkResults* _tmp1_;
+	PkTask* _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	PkProgressCallback _tmp4_;
+	void* _tmp4__target;
+	PkResults* _tmp5_;
+	PkResults* _tmp6_;
+	gboolean _tmp7_;
+	PkResults* _tmp8_;
+	PkResults* _tmp9_;
+	PkError* _tmp10_;
+	PkError* _tmp11_;
+	GPtrArray* package_array;
+	PkResults* _tmp12_;
+	GPtrArray* _tmp13_;
+	gchar** package_ids;
+	GPtrArray* _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	gchar** _tmp17_;
+	gint package_ids_length1;
+	gint _package_ids_size_;
+	gchar** _tmp18_;
+	gint _tmp18__length1;
+	GPtrArray* _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
+	gchar* _tmp22_;
+	gint i;
+	gboolean _tmp23_;
+	gint _tmp24_;
+	gint _tmp25_;
+	GPtrArray* _tmp26_;
+	gint _tmp27_;
+	gint _tmp28_;
+	gchar** _tmp29_;
+	gint _tmp29__length1;
+	gint _tmp30_;
+	GPtrArray* _tmp31_;
+	gpointer* _tmp32_;
+	gint _tmp32__length1;
+	gint _tmp33_;
+	PkPackage* _tmp34_;
+	const gchar* _tmp35_;
+	gchar* _tmp36_;
+	gchar* _tmp37_;
+	PkResults* _tmp38_;
+	PkTask* _tmp39_;
+	gchar** _tmp40_;
+	gint _tmp40__length1;
+	PkProgressCallback _tmp41_;
+	void* _tmp41__target;
+	PkResults* _tmp42_;
+	PkResults* _tmp43_;
+	GError * _inner_error_;
+};
+
 struct _ProgressBarDialog {
 	GtkWindow parent_instance;
 	ProgressBarDialogPrivate * priv;
@@ -353,7 +447,6 @@ enum  {
 	USER_INTERFACE_DUMMY_PROPERTY,
 	USER_INTERFACE_BOOK,
 	USER_INTERFACE_SELECTED_PAGE,
-	USER_INTERFACE_DEFAULT_FILE_NAME,
 	USER_INTERFACE_SCANNING,
 	USER_INTERFACE_BRIGHTNESS,
 	USER_INTERFACE_CONTRAST,
@@ -427,15 +520,15 @@ void value_set_scan_device (GValue* value, gpointer v_object);
 void value_take_scan_device (GValue* value, gpointer v_object);
 gpointer value_get_scan_device (const GValue* value);
 GType scan_device_get_type (void) G_GNUC_CONST;
-void user_interface_set_scan_devices (UserInterface* self, GList* devices);
+void user_interface_set_scan_devices (UserInterface* self, GList* devices, const gchar* missing_driver);
 Page* page_new (gint width, gint height, gint dpi, ScanDirection scan_direction);
 Page* page_construct (GType object_type, gint width, gint height, gint dpi, ScanDirection scan_direction);
 void book_append_page (Book* self, Page* page);
-static void user_interface_on_file_type_changed (UserInterface* self, GtkTreeSelection* selection);
-static gchar* user_interface_get_selected_extension (UserInterface* self, GtkTreeSelection* selection);
 static gchar* user_interface_choose_file_location (UserInterface* self);
-const gchar* user_interface_get_default_file_name (UserInterface* self);
-static void _user_interface_on_file_type_changed_gtk_tree_selection_changed (GtkTreeSelection* _sender, gpointer self);
+static Block1Data* block1_data_ref (Block1Data* _data1_);
+static void block1_data_unref (void * _userdata_);
+static void __lambda5_ (Block1Data* _data1_);
+static void ___lambda5__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
 static gboolean user_interface_save_document (UserInterface* self, gboolean force_choose_location);
 void user_interface_show_progress_dialog (UserInterface* self);
 void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError** error);
@@ -543,22 +636,22 @@ Book* book_view_get_book (BookView* self);
 void book_delete_page (Book* self, Page* page);
 static void _user_interface_page_delete_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
 static void user_interface_reorder_document (UserInterface* self);
-static Block1Data* block1_data_ref (Block1Data* _data1_);
-static void block1_data_unref (void * _userdata_);
-static gboolean __lambda5_ (Block1Data* _data1_, GdkEventKey* e);
-static gboolean ___lambda5__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self);
+static Block2Data* block2_data_ref (Block2Data* _data2_);
+static void block2_data_unref (void * _userdata_);
+static gboolean __lambda6_ (Block2Data* _data2_, GdkEventKey* e);
+static gboolean ___lambda6__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self);
 static GtkButton* user_interface_make_reorder_button (UserInterface* self, const gchar* text, const gchar* items);
-static void __lambda6_ (Block1Data* _data1_);
+static void __lambda7_ (Block2Data* _data2_);
 void book_combine_sides (Book* self);
-static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void __lambda7_ (Block1Data* _data1_);
-void book_combine_sides_reverse (Book* self);
 static void ___lambda7__gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void __lambda8_ (Block1Data* _data1_);
-void book_reverse (Book* self);
+static void __lambda8_ (Block2Data* _data2_);
+void book_combine_sides_reverse (Book* self);
 static void ___lambda8__gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void __lambda9_ (Block1Data* _data1_);
+static void __lambda9_ (Block2Data* _data2_);
+void book_reverse (Book* self);
 static void ___lambda9__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void __lambda10_ (Block2Data* _data2_);
+static void ___lambda10__gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void user_interface_reorder_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
 static void _user_interface_reorder_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
 static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar* items);
@@ -596,6 +689,18 @@ static void _user_interface_quit_menuitem_activate_cb_gtk_menu_item_activate (Gt
 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_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_);
+static void block3_data_unref (void * _userdata_);
+static void user_interface_install_packages (UserInterface* self, gchar** packages, int packages_length1, PkProgressCallback progress_callback, void* progress_callback_target, GAsyncReadyCallback _callback_, gpointer _user_data_);
+static PkResults* user_interface_install_packages_finish (UserInterface* self, GAsyncResult* _res_, GError** error);
+static void ___lambda12_ (UserInterface* self);
+static void ____lambda12__pk_progress_callback (PkProgress* progress, PkProgressType type, gpointer self);
+static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _result_);
+static void ____lambda13__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self);
+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_window_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event);
@@ -608,23 +713,23 @@ static void _user_interface_page_scan_direction_changed_cb_page_scan_direction_c
 static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* combo, gint default_dpi, gint current_dpi);
 static gboolean user_interface_is_desktop (UserInterface* self, const gchar* name);
 static void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self);
-static void __lambda11_ (UserInterface* self);
-static void ___lambda11__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void __lambda12_ (UserInterface* self);
-static void ___lambda12__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void __lambda13_ (UserInterface* self);
-static void ___lambda13__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
 static void __lambda14_ (UserInterface* self);
 static void ___lambda14__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-void user_interface_set_brightness (UserInterface* self, gint value);
 static void __lambda15_ (UserInterface* self);
-static void ___lambda15__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
-void user_interface_set_contrast (UserInterface* self, gint value);
+static void ___lambda15__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
 static void __lambda16_ (UserInterface* self);
-static void ___lambda16__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
-void user_interface_set_quality (UserInterface* self, gint value);
+static void ___lambda16__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
 static void __lambda17_ (UserInterface* self);
-static void ___lambda17__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
+static void ___lambda17__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+void user_interface_set_brightness (UserInterface* self, gint value);
+static void __lambda18_ (UserInterface* self);
+static void ___lambda18__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
+void user_interface_set_contrast (UserInterface* self, gint value);
+static void __lambda19_ (UserInterface* self);
+static void ___lambda19__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
+void user_interface_set_quality (UserInterface* self, gint value);
+static void __lambda20_ (UserInterface* self);
+static void ___lambda20__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
 BookView* book_view_new (Book* book);
 BookView* book_view_construct (GType object_type, Book* book);
 static void _user_interface_page_selected_cb_book_view_page_selected (BookView* _sender, Page* page, gpointer self);
@@ -639,16 +744,15 @@ static gchar* user_interface_get_state_filename (UserInterface* self);
 static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, gint _default_);
 static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, gboolean _default_);
 static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, const gchar* _default_);
-static gboolean ___lambda10_ (UserInterface* self);
-static gboolean ____lambda10__gsource_func (gpointer self);
-static gboolean ___lambda18_ (UserInterface* self);
-static gboolean ____lambda18__gsource_func (gpointer self);
+static gboolean ___lambda11_ (UserInterface* self);
+static gboolean ____lambda11__gsource_func (gpointer self);
+static gboolean ___lambda21_ (UserInterface* self);
+static gboolean ____lambda21__gsource_func (gpointer self);
 void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble value);
 void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* value);
 void user_interface_start (UserInterface* self);
 Page* user_interface_get_selected_page (UserInterface* self);
 void user_interface_set_selected_page (UserInterface* self, Page* value);
-void user_interface_set_default_file_name (UserInterface* self, const gchar* value);
 void user_interface_set_scanning (UserInterface* self, gboolean value);
 void user_interface_set_selected_device (UserInterface* self, const gchar* value);
 static void g_cclosure_user_marshal_VOID__STRING_SCAN_OPTIONS (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
@@ -685,100 +789,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 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_added_cb ((UserInterface*) self, _sender, page);
-#line 691 "ui.c"
+#line 795 "ui.c"
 }
 
 
 static void _user_interface_reordered_cb_book_reordered (Book* _sender, 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_reordered_cb ((UserInterface*) self, _sender);
-#line 698 "ui.c"
+#line 802 "ui.c"
 }
 
 
 static void _user_interface_page_removed_cb_book_page_removed (Book* _sender, Page* page, 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_page_removed_cb ((UserInterface*) self, _sender, page);
-#line 705 "ui.c"
+#line 809 "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 712 "ui.c"
+#line 816 "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 719 "ui.c"
+#line 823 "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 726 "ui.c"
+#line 830 "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 733 "ui.c"
+#line 837 "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 740 "ui.c"
+#line 844 "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 747 "ui.c"
+#line 851 "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 754 "ui.c"
+#line 858 "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 761 "ui.c"
+#line 865 "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 768 "ui.c"
+#line 872 "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 775 "ui.c"
+#line 879 "ui.c"
 }
 
 
 static void _user_interface_needs_saving_cb_book_needs_saving_changed (Book* _sender, gpointer self) {
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_needs_saving_cb ((UserInterface*) self, _sender);
-#line 782 "ui.c"
+#line 886 "ui.c"
 }
 
 
@@ -798,102 +902,102 @@ UserInterface* user_interface_construct (GType object_type) {
 	Book* _tmp11_ = NULL;
 	guint _tmp12_ = 0U;
 	guint _tmp13_ = 0U;
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (UserInterface*) g_object_new (object_type, NULL);
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_settings_new ("org.gnome.SimpleScan");
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->settings);
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->settings = _tmp0_;
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_new ();
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_book (self, _tmp2_);
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_book_unref0 (_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"
 	_tmp3_ = self->priv->_book;
-#line 264 "/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 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"
 	_tmp4_ = self->priv->_book;
-#line 265 "/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 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"
 	_tmp5_ = self->priv->_book;
-#line 266 "/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 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"
 	_tmp6_ = self->priv->_book;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 268 "/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 269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_load (self);
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = autosave_manager_new ();
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_autosave_manager_unref0 (self->priv->autosave_manager);
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->autosave_manager = _tmp7_;
 #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"
 	_tmp8_ = self->priv->autosave_manager;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->_book;
-#line 272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	autosave_manager_set_book (_tmp8_, _tmp9_);
 #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"
 	_tmp10_ = 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"
 	autosave_manager_load (_tmp10_);
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = self->priv->_book;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = book_get_n_pages (_tmp11_);
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = _tmp12_;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp13_ == ((guint) 0)) {
-#line 860 "ui.c"
+#line 964 "ui.c"
 		Book* _tmp14_ = NULL;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_add_default_page (self);
 #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"
 		_tmp14_ = self->priv->_book;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_set_needs_saving (_tmp14_, FALSE);
-#line 868 "ui.c"
+#line 972 "ui.c"
 	} else {
 		BookView* _tmp15_ = NULL;
 		Book* _tmp16_ = NULL;
 		Page* _tmp17_ = NULL;
 		Page* _tmp18_ = NULL;
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = self->priv->book_view;
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = self->priv->_book;
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = book_get_page (_tmp16_, 0);
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp18_ = _tmp17_;
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_view_set_selected_page (_tmp15_, _tmp18_);
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (_tmp18_);
-#line 886 "ui.c"
+#line 990 "ui.c"
 	}
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 890 "ui.c"
+#line 994 "ui.c"
 }
 
 
 UserInterface* user_interface_new (void) {
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return user_interface_construct (TYPE_USER_INTERFACE);
-#line 897 "ui.c"
+#line 1001 "ui.c"
 }
 
 
@@ -904,99 +1008,99 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 	GtkListStore* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (device != NULL, FALSE);
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	have_iter = FALSE;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->device_model;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_iter = _tmp1_;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 922 "ui.c"
+#line 1026 "ui.c"
 		{
 			gboolean _tmp3_ = FALSE;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = TRUE;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 929 "ui.c"
+#line 1033 "ui.c"
 				gchar* d = NULL;
 				GtkListStore* _tmp8_ = NULL;
 				GtkTreeIter _tmp9_ = {0};
 				const gchar* _tmp10_ = NULL;
 				const gchar* _tmp11_ = NULL;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp3_) {
-#line 937 "ui.c"
+#line 1041 "ui.c"
 					gboolean _tmp4_ = FALSE;
 					gboolean _tmp5_ = FALSE;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp5_ = have_iter;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp5_) {
-#line 944 "ui.c"
+#line 1048 "ui.c"
 						GtkListStore* _tmp6_ = NULL;
 						gboolean _tmp7_ = FALSE;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp6_ = self->priv->device_model;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp7_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp6_, &_vala_iter);
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp4_ = _tmp7_;
-#line 953 "ui.c"
+#line 1057 "ui.c"
 					} else {
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp4_ = FALSE;
-#line 957 "ui.c"
+#line 1061 "ui.c"
 					}
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp4_) {
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 963 "ui.c"
+#line 1067 "ui.c"
 					}
 				}
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp3_ = FALSE;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = self->priv->device_model;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = _vala_iter;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				gtk_tree_model_get ((GtkTreeModel*) _tmp8_, &_tmp9_, 0, &d, -1, -1);
 #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"
 				_tmp10_ = d;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp11_ = device;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (g_strcmp0 (_tmp10_, _tmp11_) == 0) {
 #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"
 					have_iter = TRUE;
-#line 982 "ui.c"
+#line 1086 "ui.c"
 				}
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (d);
-#line 986 "ui.c"
+#line 1090 "ui.c"
 			}
 		}
 	}
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = have_iter;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (iter) {
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*iter = _vala_iter;
-#line 996 "ui.c"
+#line 1100 "ui.c"
 	}
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 1000 "ui.c"
+#line 1104 "ui.c"
 }
 
 
@@ -1006,33 +1110,35 @@ static void user_interface_show_error_dialog (UserInterface* self, const gchar*
 	GtkMessageDialog* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_title != NULL);
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_text != NULL);
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = error_title;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 312 "/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 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp1_);
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dialog = _tmp1_;
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _ ("_Close");
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_add_button ((GtkDialog*) dialog, _tmp2_, 0);
 #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"
 	_tmp3_ = error_text;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_message_dialog_format_secondary_text (dialog, "%s", _tmp3_);
 #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);
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) dialog);
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
-#line 1036 "ui.c"
+#line 1142 "ui.c"
 }
 
 
@@ -1057,87 +1163,87 @@ void user_interface_authorize (UserInterface* self, const gchar* resource, gchar
 	const gchar* _tmp14_ = NULL;
 	const gchar* _tmp15_ = NULL;
 	gchar* _tmp16_ = NULL;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (resource != NULL);
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Username and password required to access '%s'");
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = resource;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	description = _tmp2_;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	description = _tmp2_;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->username_entry;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_entry_set_text (_tmp3_, "");
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->password_entry;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_entry_set_text (_tmp4_, "");
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->authorize_label;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_label_set_text (_tmp5_, description);
 #line 330 "/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"
 	_tmp6_ = self->priv->authorize_dialog;
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp6_, TRUE);
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = self->priv->authorize_dialog;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_run (_tmp7_);
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->authorize_dialog;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp8_, FALSE);
 #line 334 "/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"
 	_tmp9_ = self->priv->username_entry;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = gtk_entry_get_text (_tmp9_);
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = _tmp10_;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = g_strdup (_tmp11_);
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_vala_username);
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_username = _tmp12_;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->password_entry;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = gtk_entry_get_text (_tmp13_);
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = _tmp14_;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = g_strdup (_tmp15_);
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_vala_password);
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_password = _tmp16_;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (description);
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (username) {
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*username = _vala_username;
-#line 1127 "ui.c"
+#line 1233 "ui.c"
 	} else {
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_vala_username);
-#line 1131 "ui.c"
+#line 1237 "ui.c"
 	}
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (password) {
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*password = _vala_password;
-#line 1137 "ui.c"
+#line 1243 "ui.c"
 	} else {
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_vala_password);
-#line 1141 "ui.c"
+#line 1247 "ui.c"
 	}
 }
 
@@ -1148,50 +1254,50 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (widget != NULL);
 #line 341 "/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"
 	_tmp0_ = self->priv->setting_devices;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 1162 "ui.c"
+#line 1268 "ui.c"
 	}
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->user_selected_device = TRUE;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_selected_device (self);
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _tmp3_ != NULL;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp3_);
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 1178 "ui.c"
+#line 1284 "ui.c"
 		GSettings* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->settings;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = user_interface_get_selected_device (self);
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _tmp6_;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_settings_set_string (_tmp5_, "selected-device", _tmp8_);
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp8_);
-#line 1195 "ui.c"
+#line 1301 "ui.c"
 	}
 }
 
@@ -1199,7 +1305,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 1203 "ui.c"
+#line 1309 "ui.c"
 }
 
 
@@ -1209,522 +1315,574 @@ static void user_interface_update_info_bar (UserInterface* self) {
 	gchar* text = NULL;
 	gchar* image_id = NULL;
 	gboolean show_close_button = FALSE;
+	gboolean show_install_button = FALSE;
 	gboolean show_change_scanner_button = FALSE;
 	gboolean _tmp0_ = FALSE;
-	GtkInfoBar* _tmp15_ = NULL;
-	GtkMessageType _tmp16_ = 0;
-	GtkImage* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	gchar* message = NULL;
-	const gchar* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	GtkLabel* _tmp22_ = NULL;
+	GtkInfoBar* _tmp20_ = NULL;
+	GtkMessageType _tmp21_ = 0;
+	GtkImage* _tmp22_ = NULL;
 	const gchar* _tmp23_ = NULL;
-	GtkButton* _tmp24_ = NULL;
-	gboolean _tmp25_ = FALSE;
-	GtkButton* _tmp26_ = NULL;
-	gboolean _tmp27_ = FALSE;
-	GtkInfoBar* _tmp28_ = NULL;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gchar* message = NULL;
+	const gchar* _tmp24_ = NULL;
+	const gchar* _tmp25_ = NULL;
+	gchar* _tmp26_ = NULL;
+	GtkLabel* _tmp27_ = NULL;
+	const gchar* _tmp28_ = NULL;
+	GtkButton* _tmp29_ = NULL;
+	gboolean _tmp30_ = FALSE;
+	GtkButton* _tmp31_ = NULL;
+	gboolean _tmp32_ = FALSE;
+	GtkButton* _tmp33_ = NULL;
+	gboolean _tmp34_ = FALSE;
+	GtkInfoBar* _tmp35_ = NULL;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	show_close_button = FALSE;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	show_change_scanner_button = FALSE;
 #line 355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	show_install_button = FALSE;
+#line 356 "/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"
 	_tmp0_ = self->priv->have_error;
-#line 355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1240 "ui.c"
+#line 1351 "ui.c"
 		gchar* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		type = GTK_MESSAGE_ERROR;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = g_strdup ("dialog-error");
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (image_id);
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		image_id = _tmp1_;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = self->priv->error_title;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = g_strdup (_tmp2_);
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (title);
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		title = _tmp3_;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->error_text;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_strdup (_tmp4_);
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (text);
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		text = _tmp5_;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		show_close_button = TRUE;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = self->priv->error_change_scanner_hint;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		show_change_scanner_button = _tmp6_;
-#line 1277 "ui.c"
+#line 1388 "ui.c"
 	} else {
 		GtkListStore* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = self->priv->device_model;
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = gtk_tree_model_iter_n_children ((GtkTreeModel*) _tmp7_, NULL);
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp8_ == 0) {
-#line 1287 "ui.c"
+#line 1398 "ui.c"
 			gchar* _tmp9_ = NULL;
 			const gchar* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-			const gchar* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			type = GTK_MESSAGE_WARNING;
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = g_strdup ("dialog-warning");
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (image_id);
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			image_id = _tmp9_;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp10_ = _ ("No scanners detected");
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp11_ = g_strdup (_tmp10_);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_free0 (title);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			title = _tmp11_;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp12_ = _ ("Please check your scanner is connected and powered on");
 #line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp13_ = g_strdup (_tmp12_);
+			_tmp10_ = self->priv->missing_driver;
 #line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_free0 (text);
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			text = _tmp13_;
-#line 1317 "ui.c"
-		} else {
-			GtkInfoBar* _tmp14_ = NULL;
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp14_ = self->priv->info_bar;
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_widget_set_visible ((GtkWidget*) _tmp14_, FALSE);
+			if (_tmp10_ == NULL) {
+#line 1413 "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"
+				_tmp11_ = _ ("No scanners detected");
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp12_ = g_strdup (_tmp11_);
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_g_free0 (title);
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				title = _tmp12_;
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_free0 (image_id);
+				_tmp13_ = _ ("Please check your scanner is connected and powered on");
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_free0 (text);
+				_tmp14_ = g_strdup (_tmp13_);
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_free0 (title);
+				_g_free0 (text);
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			return;
-#line 1332 "ui.c"
-		}
-	}
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp15_ = self->priv->info_bar;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = type;
-#line 379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_info_bar_set_message_type (_tmp15_, _tmp16_);
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_ = self->priv->info_bar_image;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp18_ = image_id;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_image_set_from_icon_name (_tmp17_, _tmp18_, GTK_ICON_SIZE_DIALOG);
+				text = _tmp14_;
+#line 1434 "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"
-	_tmp19_ = title;
+				_tmp15_ = _ ("Additional software needed");
 #line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp20_ = text;
+				_tmp16_ = g_strdup (_tmp15_);
 #line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp21_ = g_strdup_printf ("<big><b>%s</b></big>\n\n%s", _tmp19_, _tmp20_);
+				_g_free0 (title);
 #line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	message = _tmp21_;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp22_ = self->priv->info_bar_label;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp23_ = message;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_label_set_markup (_tmp22_, _tmp23_);
+				title = _tmp16_;
 #line 383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp24_ = self->priv->info_bar_close_button;
+				_tmp17_ = _ ("You need to install driver software for your scanner.");
 #line 383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp25_ = show_close_button;
+				_tmp18_ = g_strdup (_tmp17_);
 #line 383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp24_, _tmp25_);
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp26_ = self->priv->info_bar_change_scanner_button;
-#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp27_ = show_change_scanner_button;
+				_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"
-	gtk_widget_set_visible ((GtkWidget*) _tmp26_, _tmp27_);
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp28_ = self->priv->info_bar;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp28_, TRUE);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				show_install_button = TRUE;
+#line 1458 "ui.c"
+			}
+		} else {
+			GtkInfoBar* _tmp19_ = NULL;
+#line 389 "/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"
+			_g_free0 (image_id);
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_g_free0 (text);
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_g_free0 (title);
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			return;
+#line 1474 "ui.c"
+		}
+	}
+#line 393 "/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"
+	_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"
+	_tmp22_ = self->priv->info_bar_image;
+#line 394 "/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"
+	_tmp24_ = title;
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp25_ = text;
+#line 395 "/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"
+	_tmp27_ = self->priv->info_bar_label;
+#line 396 "/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"
+	_tmp29_ = self->priv->info_bar_close_button;
+#line 397 "/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"
+	_tmp31_ = self->priv->info_bar_change_scanner_button;
+#line 398 "/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"
+	_tmp33_ = self->priv->info_bar_install_button;
+#line 399 "/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"
+	_tmp35_ = self->priv->info_bar;
+#line 400 "/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"
 	_g_free0 (message);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (image_id);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (text);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (title);
-#line 1385 "ui.c"
+#line 1533 "ui.c"
 }
 
 
 static gpointer _scan_device_ref0 (gpointer self) {
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? scan_device_ref (self) : NULL;
-#line 1392 "ui.c"
+#line 1540 "ui.c"
 }
 
 
-void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
+void user_interface_set_scan_devices (UserInterface* self, GList* devices, const gchar* missing_driver) {
 	gboolean have_selection = FALSE;
 	gint index = 0;
 	GtkTreeIter iter = {0};
-	gboolean _tmp0_ = FALSE;
-	GList* _tmp4_ = NULL;
-	gboolean _tmp51_ = FALSE;
-	gboolean _tmp52_ = FALSE;
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	gboolean _tmp2_ = FALSE;
+	GList* _tmp6_ = NULL;
+	gboolean _tmp53_ = FALSE;
+	gboolean _tmp54_ = FALSE;
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	have_selection = FALSE;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->setting_devices = TRUE;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->user_selected_device;
-#line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp0_) {
-#line 1414 "ui.c"
-		GtkComboBox* _tmp1_ = NULL;
-		gint _tmp2_ = 0;
-		gint _tmp3_ = 0;
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp1_ = self->priv->device_combo;
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = gtk_combo_box_get_active (_tmp1_);
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = _tmp2_;
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		have_selection = _tmp3_ >= 0;
-#line 1426 "ui.c"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = missing_driver;
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 411 "/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"
+	self->priv->missing_driver = _tmp1_;
+#line 414 "/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"
+	if (_tmp2_) {
+#line 1572 "ui.c"
+		GtkComboBox* _tmp3_ = NULL;
+		gint _tmp4_ = 0;
+		gint _tmp5_ = 0;
+#line 415 "/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"
+		_tmp4_ = gtk_combo_box_get_active (_tmp3_);
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = _tmp4_;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		have_selection = _tmp5_ >= 0;
+#line 1584 "ui.c"
 	}
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = 0;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = devices;
-#line 1432 "ui.c"
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = devices;
+#line 1590 "ui.c"
 	{
 		GList* device_collection = NULL;
 		GList* device_it = NULL;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		device_collection = _tmp4_;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		device_collection = _tmp6_;
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
-#line 1440 "ui.c"
-			ScanDevice* _tmp5_ = NULL;
+#line 1598 "ui.c"
+			ScanDevice* _tmp7_ = NULL;
 			ScanDevice* device = NULL;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp5_ = _scan_device_ref0 ((ScanDevice*) device_it->data);
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			device = _tmp5_;
-#line 1447 "ui.c"
+#line 419 "/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"
+			device = _tmp7_;
+#line 1605 "ui.c"
 			{
 				gint n_delete = 0;
-				GtkListStore* _tmp6_ = NULL;
-				gint _tmp7_ = 0;
-				GtkTreeIter _tmp8_ = {0};
-				gboolean _tmp9_ = FALSE;
-				gint _tmp21_ = 0;
-				gint _tmp44_ = 0;
-#line 404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				GtkListStore* _tmp8_ = NULL;
+				gint _tmp9_ = 0;
+				GtkTreeIter _tmp10_ = {0};
+				gboolean _tmp11_ = FALSE;
+				gint _tmp23_ = 0;
+				gint _tmp46_ = 0;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				n_delete = -1;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp6_ = self->priv->device_model;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp7_ = index;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp9_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp6_, &_tmp8_, NULL, _tmp7_);
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				iter = _tmp8_;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp9_) {
-#line 1468 "ui.c"
+#line 424 "/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"
+				_tmp9_ = index;
+#line 424 "/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"
+				iter = _tmp10_;
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (_tmp11_) {
+#line 1626 "ui.c"
 					gint i = 0;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					i = 0;
-#line 1472 "ui.c"
+#line 1630 "ui.c"
 					{
-						gboolean _tmp10_ = FALSE;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp10_ = TRUE;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						gboolean _tmp12_ = FALSE;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp12_ = TRUE;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						while (TRUE) {
-#line 1479 "ui.c"
+#line 1637 "ui.c"
 							gchar* name = NULL;
 							gboolean matched = FALSE;
-							GtkListStore* _tmp13_ = NULL;
-							GtkTreeIter _tmp14_ = {0};
-							const gchar* _tmp15_ = NULL;
-							ScanDevice* _tmp16_ = NULL;
+							GtkListStore* _tmp15_ = NULL;
+							GtkTreeIter _tmp16_ = {0};
 							const gchar* _tmp17_ = NULL;
-							gboolean _tmp18_ = FALSE;
-							gint _tmp20_ = 0;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							if (!_tmp10_) {
-#line 1491 "ui.c"
-								GtkListStore* _tmp11_ = NULL;
-								gboolean _tmp12_ = FALSE;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_tmp11_ = self->priv->device_model;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_tmp12_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp11_, &iter);
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								if (!_tmp12_) {
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							ScanDevice* _tmp18_ = NULL;
+							const gchar* _tmp19_ = NULL;
+							gboolean _tmp20_ = FALSE;
+							gint _tmp22_ = 0;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							if (!_tmp12_) {
+#line 1649 "ui.c"
+								GtkListStore* _tmp13_ = NULL;
+								gboolean _tmp14_ = FALSE;
+#line 441 "/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"
+								_tmp14_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp13_, &iter);
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+								if (!_tmp14_) {
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									break;
-#line 1502 "ui.c"
+#line 1660 "ui.c"
 								}
 							}
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp10_ = FALSE;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp13_ = self->priv->device_model;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp14_ = iter;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							gtk_tree_model_get ((GtkTreeModel*) _tmp13_, &_tmp14_, 0, &name, -1, -1);
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp15_ = name;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp16_ = device;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp17_ = _tmp16_->name;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							matched = g_strcmp0 (_tmp15_, _tmp17_) == 0;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp18_ = matched;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							if (_tmp18_) {
-#line 1525 "ui.c"
-								gint _tmp19_ = 0;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_tmp19_ = i;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								n_delete = _tmp19_;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp12_ = FALSE;
+#line 432 "/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"
+							_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"
+							_tmp17_ = name;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp18_ = device;
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp19_ = _tmp18_->name;
+#line 433 "/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"
+							_tmp20_ = matched;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							if (_tmp20_) {
+#line 1683 "ui.c"
+								gint _tmp21_ = 0;
+#line 437 "/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"
 								_g_free0 (name);
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								break;
-#line 1535 "ui.c"
+#line 1693 "ui.c"
 							}
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp20_ = i;
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							i = _tmp20_ + 1;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp22_ = i;
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							i = _tmp22_ + 1;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (name);
-#line 1543 "ui.c"
+#line 1701 "ui.c"
 						}
 					}
 				}
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp21_ = n_delete;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp21_ >= 0) {
-#line 1551 "ui.c"
+#line 445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp23_ = n_delete;
+#line 445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (_tmp23_ >= 0) {
+#line 1709 "ui.c"
 					gint i = 0;
-					GtkListStore* _tmp22_ = NULL;
-					GtkTreeIter _tmp23_ = {0};
-					ScanDevice* _tmp24_ = NULL;
-					const gchar* _tmp25_ = NULL;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp22_ = self->priv->device_model;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp23_ = iter;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp24_ = device;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp25_ = _tmp24_->label;
-#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_list_store_set (_tmp22_, &_tmp23_, 1, _tmp25_, -1, -1);
-#line 1567 "ui.c"
+					GtkListStore* _tmp24_ = NULL;
+					GtkTreeIter _tmp25_ = {0};
+					ScanDevice* _tmp26_ = NULL;
+					const gchar* _tmp27_ = NULL;
+#line 450 "/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"
+					_tmp25_ = iter;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp26_ = device;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp27_ = _tmp26_->label;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gtk_list_store_set (_tmp24_, &_tmp25_, 1, _tmp27_, -1, -1);
+#line 1725 "ui.c"
 					{
-						gboolean _tmp26_ = FALSE;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						gboolean _tmp28_ = FALSE;
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						i = 0;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp26_ = TRUE;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp28_ = TRUE;
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						while (TRUE) {
-#line 1576 "ui.c"
-							gint _tmp28_ = 0;
-							gint _tmp29_ = 0;
-							GtkListStore* _tmp30_ = NULL;
+#line 1734 "ui.c"
+							gint _tmp30_ = 0;
 							gint _tmp31_ = 0;
-							GtkTreeIter _tmp32_ = {0};
-							GtkListStore* _tmp33_ = NULL;
+							GtkListStore* _tmp32_ = NULL;
+							gint _tmp33_ = 0;
 							GtkTreeIter _tmp34_ = {0};
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							if (!_tmp26_) {
-#line 1586 "ui.c"
-								gint _tmp27_ = 0;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_tmp27_ = i;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								i = _tmp27_ + 1;
-#line 1592 "ui.c"
+							GtkListStore* _tmp35_ = NULL;
+							GtkTreeIter _tmp36_ = {0};
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							if (!_tmp28_) {
+#line 1744 "ui.c"
+								gint _tmp29_ = 0;
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+								_tmp29_ = i;
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+								i = _tmp29_ + 1;
+#line 1750 "ui.c"
 							}
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp26_ = FALSE;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp28_ = i;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp29_ = n_delete;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							if (!(_tmp28_ < _tmp29_)) {
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp28_ = FALSE;
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp30_ = i;
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp31_ = n_delete;
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							if (!(_tmp30_ < _tmp31_)) {
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								break;
-#line 1604 "ui.c"
+#line 1762 "ui.c"
 							}
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp30_ = self->priv->device_model;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp31_ = index;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp30_, &_tmp32_, NULL, _tmp31_);
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							iter = _tmp32_;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp33_ = self->priv->device_model;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp34_ = iter;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							gtk_list_store_remove (_tmp33_, &_tmp34_);
-#line 1620 "ui.c"
+#line 454 "/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"
+							_tmp33_ = index;
+#line 454 "/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"
+							_tmp35_ = self->priv->device_model;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp36_ = iter;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							gtk_list_store_remove (_tmp35_, &_tmp36_);
+#line 1778 "ui.c"
 						}
 					}
 				} else {
-					GtkListStore* _tmp35_ = NULL;
-					gint _tmp36_ = 0;
-					GtkTreeIter _tmp37_ = {0};
-					GtkListStore* _tmp38_ = NULL;
+					GtkListStore* _tmp37_ = NULL;
+					gint _tmp38_ = 0;
 					GtkTreeIter _tmp39_ = {0};
-					ScanDevice* _tmp40_ = NULL;
-					const gchar* _tmp41_ = NULL;
+					GtkListStore* _tmp40_ = NULL;
+					GtkTreeIter _tmp41_ = {0};
 					ScanDevice* _tmp42_ = NULL;
 					const gchar* _tmp43_ = NULL;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp35_ = self->priv->device_model;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp36_ = index;
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_list_store_insert (_tmp35_, &_tmp37_, _tmp36_);
-#line 443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					iter = _tmp37_;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp38_ = self->priv->device_model;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp39_ = iter;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp40_ = device;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp41_ = _tmp40_->name;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					ScanDevice* _tmp44_ = NULL;
+					const gchar* _tmp45_ = NULL;
+#line 460 "/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"
+					_tmp38_ = index;
+#line 460 "/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"
+					_tmp40_ = self->priv->device_model;
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp41_ = iter;
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp42_ = device;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp43_ = _tmp42_->label;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_list_store_set (_tmp38_, &_tmp39_, 0, _tmp41_, 1, _tmp43_, -1, -1);
-#line 1655 "ui.c"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp43_ = _tmp42_->name;
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp44_ = device;
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp45_ = _tmp44_->label;
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gtk_list_store_set (_tmp40_, &_tmp41_, 0, _tmp43_, 1, _tmp45_, -1, -1);
+#line 1813 "ui.c"
 				}
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp44_ = index;
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				index = _tmp44_ + 1;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp46_ = index;
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				index = _tmp46_ + 1;
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_scan_device_unref0 (device);
-#line 1663 "ui.c"
+#line 1821 "ui.c"
 			}
 		}
 	}
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
-#line 1669 "ui.c"
-		GtkListStore* _tmp45_ = NULL;
-		gint _tmp46_ = 0;
-		GtkTreeIter _tmp47_ = {0};
-		gboolean _tmp48_ = FALSE;
-		GtkListStore* _tmp49_ = NULL;
-		GtkTreeIter _tmp50_ = {0};
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp45_ = self->priv->device_model;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp46_ = index;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp48_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp45_, &_tmp47_, NULL, _tmp46_);
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		iter = _tmp47_;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (!_tmp48_) {
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1827 "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"
+		_tmp47_ = self->priv->device_model;
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp48_ = index;
+#line 467 "/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"
+		iter = _tmp49_;
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (!_tmp50_) {
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 1688 "ui.c"
+#line 1846 "ui.c"
 		}
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp49_ = self->priv->device_model;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp50_ = iter;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_list_store_remove (_tmp49_, &_tmp50_);
-#line 1696 "ui.c"
-	}
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp52_ = have_selection;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp52_) {
-#line 1702 "ui.c"
-		GList* _tmp53_ = NULL;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp53_ = devices;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp51_ = _tmp53_ != NULL;
-#line 1708 "ui.c"
+#line 468 "/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"
+		_tmp52_ = iter;
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_list_store_remove (_tmp51_, &_tmp52_);
+#line 1854 "ui.c"
+	}
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp54_ = have_selection;
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (!_tmp54_) {
+#line 1860 "ui.c"
+		GList* _tmp55_ = NULL;
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp55_ = devices;
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp53_ = _tmp55_ != NULL;
+#line 1866 "ui.c"
 	} else {
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp51_ = FALSE;
-#line 1712 "ui.c"
-	}
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp51_) {
-#line 1716 "ui.c"
-		GtkComboBox* _tmp54_ = NULL;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp54_ = self->priv->device_combo;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_combo_box_set_active (_tmp54_, 0);
-#line 1722 "ui.c"
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp53_ = FALSE;
+#line 1870 "ui.c"
+	}
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp53_) {
+#line 1874 "ui.c"
+		GtkComboBox* _tmp56_ = NULL;
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp56_ = self->priv->device_combo;
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_combo_box_set_active (_tmp56_, 0);
+#line 1880 "ui.c"
 	}
-#line 457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->setting_devices = FALSE;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_info_bar (self);
-#line 1728 "ui.c"
+#line 1886 "ui.c"
 }
 
 
@@ -1737,31 +1895,69 @@ static void user_interface_add_default_page (UserInterface* self) {
 	Page* _tmp4_ = NULL;
 	Book* _tmp5_ = NULL;
 	BookView* _tmp6_ = NULL;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->default_page_width;
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->default_page_height;
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->default_page_dpi;
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->default_page_scan_direction;
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_new (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp4_;
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->_book;
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_append_page (_tmp5_, page);
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->book_view;
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_view_set_selected_page (_tmp6_, page);
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 1765 "ui.c"
+#line 1923 "ui.c"
+}
+
+
+static Block1Data* block1_data_ref (Block1Data* _data1_) {
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_atomic_int_inc (&_data1_->_ref_count_);
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return _data1_;
+#line 1932 "ui.c"
+}
+
+
+static void block1_data_unref (void * _userdata_) {
+	Block1Data* _data1_;
+	_data1_ = (Block1Data*) _userdata_;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
+#line 1941 "ui.c"
+		UserInterface* self;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		self = _data1_->self;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_data1_->file_type_combo);
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_data1_->file_type_store);
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (self);
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_slice_free (Block1Data, _data1_);
+#line 1953 "ui.c"
+	}
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 1961 "ui.c"
 }
 
 
@@ -1786,7 +1982,7 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	_tmp3_ = _result_;
 #line 933 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1790 "ui.c"
+#line 1986 "ui.c"
 		gchar* _tmp4_ = NULL;
 #line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
@@ -1794,13 +1990,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.28/vapi/glib-2.0.vapi"
 		return result;
-#line 1798 "ui.c"
+#line 1994 "ui.c"
 	} else {
 #line 936 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		result = -1;
 #line 936 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return result;
-#line 1804 "ui.c"
+#line 2000 "ui.c"
 	}
 }
 
@@ -1834,7 +2030,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp2_ = start;
 #line 1232 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 1838 "ui.c"
+#line 2034 "ui.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 #line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
@@ -1843,13 +2039,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp4_ = start;
 #line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 1847 "ui.c"
+#line 2043 "ui.c"
 	}
 #line 1235 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
 #line 1235 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 1853 "ui.c"
+#line 2049 "ui.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
 #line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
@@ -1858,13 +2054,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp7_ = end;
 #line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 1862 "ui.c"
+#line 2058 "ui.c"
 	}
 #line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
 #line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 1868 "ui.c"
+#line 2064 "ui.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
 #line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
@@ -1873,11 +2069,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp11_ = string_length;
 #line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1877 "ui.c"
+#line 2073 "ui.c"
 	} else {
 #line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 1881 "ui.c"
+#line 2077 "ui.c"
 	}
 #line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
@@ -1885,7 +2081,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp13_ = end;
 #line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 1889 "ui.c"
+#line 2085 "ui.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
 #line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
@@ -1894,11 +2090,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp15_ = string_length;
 #line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 1898 "ui.c"
+#line 2094 "ui.c"
 	} else {
 #line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 1902 "ui.c"
+#line 2098 "ui.c"
 	}
 #line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
@@ -1920,341 +2116,132 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	result = _tmp21_;
 #line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	return result;
-#line 1924 "ui.c"
+#line 2120 "ui.c"
 }
 
 
-static void user_interface_on_file_type_changed (UserInterface* self, GtkTreeSelection* selection) {
+static void __lambda5_ (Block1Data* _data1_) {
+	UserInterface* self;
 	gchar* extension = NULL;
-	GtkTreeSelection* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_ = NULL;
+	GtkTreeIter i = {0};
+	GtkComboBox* _tmp1_ = NULL;
+	GtkTreeIter _tmp2_ = {0};
+	gboolean _tmp3_ = FALSE;
 	gchar* path = NULL;
-	GtkFileChooserDialog* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	GtkFileChooserDialog* _tmp6_ = NULL;
+	gchar* _tmp7_ = NULL;
 	gchar* filename = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	const gchar* _tmp8_ = NULL;
+	gchar* _tmp9_ = NULL;
 	gint extension_index = 0;
-	const gchar* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	const gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	GtkFileChooserDialog* _tmp15_ = NULL;
+	const gchar* _tmp10_ = NULL;
+	gint _tmp11_ = 0;
+	gint _tmp12_ = 0;
 	const gchar* _tmp16_ = NULL;
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (selection != NULL);
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = selection;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = user_interface_get_selected_extension (self, _tmp0_);
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	extension = _tmp1_;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = self->priv->save_dialog;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp2_);
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	path = _tmp3_;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = path;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = g_path_get_basename (_tmp4_);
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	filename = _tmp5_;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = filename;
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = string_last_index_of_char (_tmp6_, (gunichar) '.', 0);
-#line 479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	extension_index = _tmp7_;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = extension_index;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp8_ >= 0) {
-#line 1979 "ui.c"
-		const gchar* _tmp9_ = NULL;
-		gint _tmp10_ = 0;
-		gchar* _tmp11_ = NULL;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = filename;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp10_ = extension_index;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp11_ = string_slice (_tmp9_, (glong) 0, (glong) _tmp10_);
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	const gchar* _tmp17_ = NULL;
+	gchar* _tmp18_ = NULL;
+	GtkFileChooserDialog* _tmp19_ = NULL;
+	const gchar* _tmp20_ = NULL;
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = _data1_->self;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = g_strdup ("");
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	extension = _tmp0_;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = _data1_->file_type_combo;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = gtk_combo_box_get_active_iter (_tmp1_, &_tmp2_);
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	i = _tmp2_;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp3_) {
+#line 2161 "ui.c"
+		GtkListStore* _tmp4_ = NULL;
+		GtkTreeIter _tmp5_ = {0};
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = _data1_->file_type_store;
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = i;
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_tree_model_get ((GtkTreeModel*) _tmp4_, &_tmp5_, 1, &extension, -1, -1);
+#line 2170 "ui.c"
+	}
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = self->priv->save_dialog;
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp6_);
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	path = _tmp7_;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = path;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_ = g_path_get_basename (_tmp8_);
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	filename = _tmp9_;
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp10_ = filename;
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp11_ = string_last_index_of_char (_tmp10_, (gunichar) '.', 0);
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	extension_index = _tmp11_;
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp12_ = extension_index;
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp12_ >= 0) {
+#line 2194 "ui.c"
+		const gchar* _tmp13_ = NULL;
+		gint _tmp14_ = 0;
+		gchar* _tmp15_ = NULL;
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp13_ = filename;
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp14_ = extension_index;
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp15_ = string_slice (_tmp13_, (glong) 0, (glong) _tmp14_);
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		filename = _tmp11_;
-#line 1993 "ui.c"
-	}
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = filename;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = extension;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = g_strconcat (_tmp12_, _tmp13_, NULL);
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (filename);
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	filename = _tmp14_;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp15_ = self->priv->save_dialog;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		filename = _tmp15_;
+#line 2208 "ui.c"
+	}
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = filename;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp15_, _tmp16_);
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp17_ = extension;
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp18_ = g_strconcat (_tmp16_, _tmp17_, NULL);
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	filename = _tmp18_;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp19_ = self->priv->save_dialog;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp20_ = filename;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp19_, _tmp20_);
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (filename);
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (path);
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (extension);
-#line 2017 "ui.c"
+#line 2232 "ui.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 2024 "ui.c"
-}
-
-
-static gchar* user_interface_get_selected_extension (UserInterface* self, GtkTreeSelection* selection) {
-	gchar* result = NULL;
-	GtkTreeModel* model = NULL;
-	GtkTreeIter iter = {0};
-	gchar* extension = NULL;
-	gchar* _tmp0_ = NULL;
-	GtkTreeSelection* _tmp1_ = NULL;
-	GtkTreeModel* _tmp2_ = NULL;
-	GtkTreeIter _tmp3_ = {0};
-	gboolean _tmp4_ = FALSE;
-	GtkTreeModel* _tmp5_ = NULL;
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (selection != NULL, NULL);
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = g_strdup ("");
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	extension = _tmp0_;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = selection;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = gtk_tree_selection_get_selected (_tmp1_, &_tmp2_, &_tmp3_);
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (model);
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = _g_object_ref0 (_tmp2_);
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	model = _tmp5_;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp3_;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp4_) {
-#line 2061 "ui.c"
-		GtkTreeModel* _tmp6_ = NULL;
-		GtkTreeIter _tmp7_ = {0};
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = model;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = iter;
-#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_tree_model_get (_tmp6_, &_tmp7_, 1, &extension, -1, -1);
-#line 2070 "ui.c"
-	}
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = extension;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (model);
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 2078 "ui.c"
-}
-
-
-static glong string_strnlen (gchar* str, glong maxlen) {
-	glong result = 0L;
-	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	_tmp0_ = str;
-#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	_tmp1_ = maxlen;
-#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	end = _tmp2_;
-#line 1198 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	_tmp3_ = end;
-#line 1198 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	if (_tmp3_ == NULL) {
-#line 2101 "ui.c"
-		glong _tmp4_ = 0L;
-#line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		_tmp4_ = maxlen;
-#line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		result = _tmp4_;
-#line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		return result;
-#line 2109 "ui.c"
-	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		_tmp5_ = end;
-#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		_tmp6_ = str;
-#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		result = (glong) (_tmp5_ - _tmp6_);
-#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		return result;
-#line 2121 "ui.c"
-	}
-}
-
-
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
-	gchar* result = NULL;
-	glong string_length = 0L;
-	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1208 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	_tmp1_ = offset;
-#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	if (_tmp1_ >= ((glong) 0)) {
-#line 2145 "ui.c"
-		glong _tmp2_ = 0L;
-#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		_tmp2_ = len;
-#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 2151 "ui.c"
-	} else {
-#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		_tmp0_ = FALSE;
-#line 2155 "ui.c"
-	}
-#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	if (_tmp0_) {
-#line 2159 "ui.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		_tmp3_ = offset;
-#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		_tmp4_ = len;
-#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		string_length = _tmp5_;
-#line 2171 "ui.c"
-	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		_tmp6_ = strlen (self);
-#line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		_tmp7_ = _tmp6_;
-#line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		string_length = (glong) _tmp7_;
-#line 2181 "ui.c"
-	}
-#line 1217 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	_tmp8_ = offset;
-#line 1217 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	if (_tmp8_ < ((glong) 0)) {
-#line 2187 "ui.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1218 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		_tmp9_ = string_length;
-#line 1218 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		_tmp10_ = offset;
-#line 1218 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		offset = _tmp9_ + _tmp10_;
-#line 1219 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		_tmp11_ = offset;
-#line 1219 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 2201 "ui.c"
-	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		_tmp12_ = offset;
-#line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		_tmp13_ = string_length;
-#line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 2211 "ui.c"
-	}
-#line 1223 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	_tmp14_ = len;
-#line 1223 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	if (_tmp14_ < ((glong) 0)) {
-#line 2217 "ui.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		_tmp16_ = offset;
-#line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-		len = _tmp15_ - _tmp16_;
-#line 2226 "ui.c"
-	}
-#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	_tmp17_ = offset;
-#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	_tmp18_ = len;
-#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	_tmp19_ = string_length;
-#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	_tmp20_ = offset;
-#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	_tmp21_ = len;
-#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	result = _tmp22_;
-#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
-	return result;
-#line 2246 "ui.c"
-}
-
-
-static void _user_interface_on_file_type_changed_gtk_tree_selection_changed (GtkTreeSelection* _sender, gpointer self) {
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_on_file_type_changed ((UserInterface*) self, _sender);
-#line 2253 "ui.c"
+static void ___lambda5__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda5_ (self);
+#line 2239 "ui.c"
 }
 
 
 static gchar* user_interface_choose_file_location (UserInterface* self) {
 	gchar* result = NULL;
+	Block1Data* _data1_;
 	gchar* directory = NULL;
 	GSettings* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
@@ -2286,575 +2273,472 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 	GtkFileChooserDialog* _tmp29_ = NULL;
 	GtkFileFilter* _tmp30_ = NULL;
 	GtkFileFilter* _tmp31_ = NULL;
-	GtkExpander* expander = NULL;
-	const gchar* _tmp32_ = NULL;
-	GtkExpander* _tmp33_ = NULL;
-	GtkExpander* _tmp34_ = NULL;
-	GtkFileChooserDialog* _tmp35_ = NULL;
-	GtkExpander* _tmp36_ = NULL;
-	gchar* default_extension = NULL;
-	gchar* _tmp37_ = NULL;
-	gint index = 0;
-	const gchar* _tmp38_ = NULL;
-	gint _tmp39_ = 0;
-	gint _tmp40_ = 0;
-	GtkListStore* file_type_store = NULL;
-	GtkListStore* _tmp44_ = NULL;
+	GtkListStore* _tmp32_ = NULL;
 	GtkTreeIter iter = {0};
+	GtkListStore* _tmp33_ = NULL;
+	GtkTreeIter _tmp34_ = {0};
+	GtkListStore* _tmp35_ = NULL;
+	GtkTreeIter _tmp36_ = {0};
+	const gchar* _tmp37_ = NULL;
+	GtkListStore* _tmp38_ = NULL;
+	GtkTreeIter _tmp39_ = {0};
+	GtkListStore* _tmp40_ = NULL;
+	GtkTreeIter _tmp41_ = {0};
+	const gchar* _tmp42_ = NULL;
+	GtkListStore* _tmp43_ = NULL;
+	GtkTreeIter _tmp44_ = {0};
 	GtkListStore* _tmp45_ = NULL;
 	GtkTreeIter _tmp46_ = {0};
-	GtkListStore* _tmp47_ = NULL;
-	GtkTreeIter _tmp48_ = {0};
-	const gchar* _tmp49_ = NULL;
-	GtkListStore* _tmp50_ = NULL;
-	GtkTreeIter _tmp51_ = {0};
-	GtkListStore* _tmp52_ = NULL;
-	GtkTreeIter _tmp53_ = {0};
-	const gchar* _tmp54_ = NULL;
-	GtkListStore* _tmp55_ = NULL;
-	GtkTreeIter _tmp56_ = {0};
+	const gchar* _tmp47_ = NULL;
+	GtkBox* box = NULL;
+	GtkBox* _tmp48_ = NULL;
+	GtkBox* _tmp49_ = NULL;
+	GtkFileChooserDialog* _tmp50_ = NULL;
+	GtkBox* _tmp51_ = NULL;
+	GtkLabel* label = NULL;
+	const gchar* _tmp52_ = NULL;
+	GtkLabel* _tmp53_ = NULL;
+	GtkLabel* _tmp54_ = NULL;
+	GtkBox* _tmp55_ = NULL;
+	GtkLabel* _tmp56_ = NULL;
 	GtkListStore* _tmp57_ = NULL;
-	GtkTreeIter _tmp58_ = {0};
-	const gchar* _tmp59_ = NULL;
-	GtkTreeView* file_type_view = NULL;
-	GtkListStore* _tmp60_ = NULL;
-	GtkTreeView* _tmp61_ = NULL;
-	GtkTreeView* _tmp62_ = NULL;
-	GtkTreeView* _tmp63_ = NULL;
-	GtkTreeViewColumn* column = NULL;
+	GtkComboBox* _tmp58_ = NULL;
+	GtkComboBox* _tmp59_ = NULL;
+	GtkCellRendererText* renderer = NULL;
+	GtkCellRendererText* _tmp60_ = NULL;
+	GtkComboBox* _tmp61_ = NULL;
+	GtkCellRendererText* _tmp62_ = NULL;
+	GtkComboBox* _tmp63_ = NULL;
 	GtkCellRendererText* _tmp64_ = NULL;
-	GtkCellRendererText* _tmp65_ = NULL;
-	GtkTreeViewColumn* _tmp66_ = NULL;
-	GtkTreeViewColumn* _tmp67_ = NULL;
-	GtkTreeView* _tmp68_ = NULL;
-	GtkTreeViewColumn* _tmp69_ = NULL;
-	GtkExpander* _tmp70_ = NULL;
-	GtkTreeView* _tmp71_ = NULL;
-	GtkListStore* _tmp72_ = NULL;
-	GtkTreeIter _tmp73_ = {0};
-	gboolean _tmp74_ = FALSE;
-	GtkTreeView* _tmp85_ = NULL;
-	GtkTreeSelection* _tmp86_ = NULL;
-	GtkExpander* _tmp87_ = NULL;
+	GtkComboBox* _tmp65_ = NULL;
+	GtkComboBox* _tmp66_ = NULL;
+	GtkBox* _tmp67_ = NULL;
+	GtkComboBox* _tmp68_ = NULL;
 	gint response = 0;
-	GtkFileChooserDialog* _tmp88_ = NULL;
-	gint _tmp89_ = 0;
+	GtkFileChooserDialog* _tmp69_ = NULL;
+	gint _tmp70_ = 0;
 	gchar* uri = NULL;
-	gint _tmp90_ = 0;
-	GSettings* _tmp110_ = NULL;
-	GtkFileChooserDialog* _tmp111_ = NULL;
-	gchar* _tmp112_ = NULL;
-	gchar* _tmp113_ = NULL;
-	GtkTreeView* _tmp114_ = NULL;
-	GtkTreeSelection* _tmp115_ = NULL;
-	guint _tmp116_ = 0U;
-	GtkFileChooserDialog* _tmp117_ = NULL;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gint _tmp71_ = 0;
+	GSettings* _tmp92_ = NULL;
+	GtkFileChooserDialog* _tmp93_ = NULL;
+	gchar* _tmp94_ = NULL;
+	gchar* _tmp95_ = NULL;
+	GtkFileChooserDialog* _tmp96_ = NULL;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data1_ = g_slice_new0 (Block1Data);
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data1_->_ref_count_ = 1;
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data1_->self = g_object_ref (self);
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	directory = NULL;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_settings_get_string (_tmp0_, "save-directory");
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (directory);
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	directory = _tmp1_;
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = directory;
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_ == NULL) {
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = TRUE;
-#line 2371 "ui.c"
+#line 2352 "ui.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = directory;
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, "") == 0;
-#line 2378 "ui.c"
+#line 2359 "ui.c"
 	}
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 2382 "ui.c"
+#line 2363 "ui.c"
 		const gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = g_strdup (_tmp5_);
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (directory);
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		directory = _tmp6_;
-#line 2393 "ui.c"
+#line 2374 "ui.c"
 	}
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _ ("Save As...");
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("_Cancel");
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = _ ("_Save");
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 498 "/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 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp10_);
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_dialog);
-#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_dialog = _tmp10_;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = self->priv->save_dialog;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_do_overwrite_confirmation ((GtkFileChooser*) _tmp11_, TRUE);
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = self->priv->save_dialog;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_local_only ((GtkFileChooser*) _tmp12_, FALSE);
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->save_dialog;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = directory;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_current_folder ((GtkFileChooser*) _tmp13_, _tmp14_);
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->save_dialog;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = self->priv->_default_file_name;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp16_ = _ ("Scanned Document.pdf");
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp15_, _tmp16_);
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = gtk_file_filter_new ();
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp17_);
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filter = _tmp17_;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = filter;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = _ ("Image Files");
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_set_name (_tmp18_, _tmp19_);
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = filter;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 515 "/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"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = filter;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 516 "/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"
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = self->priv->save_dialog;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = filter;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 517 "/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"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = gtk_file_filter_new ();
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp25_);
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (filter);
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filter = _tmp25_;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = filter;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = _ ("All Files");
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_set_name (_tmp26_, _tmp27_);
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = filter;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 521 "/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"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = self->priv->save_dialog;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = filter;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = _g_object_ref0 (_tmp30_);
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp29_, _tmp31_);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp32_ = _ ("Select File _Type");
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp33_ = (GtkExpander*) gtk_expander_new_with_mnemonic (_tmp32_);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp33_);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	expander = _tmp33_;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp32_ = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING, -1);
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data1_->file_type_store = _tmp32_;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp33_ = _data1_->file_type_store;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp33_, &_tmp34_);
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp34_;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp35_ = _data1_->file_type_store;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp36_ = iter;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp37_ = _ ("PDF (multi-page document)");
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp35_, &_tmp36_, 0, _tmp37_, 1, ".pdf", -1, -1);
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp38_ = _data1_->file_type_store;
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp38_, &_tmp39_);
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp39_;
 #line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp34_ = expander;
+	_tmp40_ = _data1_->file_type_store;
 #line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_expander_set_spacing (_tmp34_, 5);
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp35_ = self->priv->save_dialog;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp36_ = expander;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_extra_widget ((GtkFileChooser*) _tmp35_, (GtkWidget*) _tmp36_);
-#line 536 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp37_ = g_strdup ("");
-#line 536 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	default_extension = _tmp37_;
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp38_ = self->priv->_default_file_name;
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp39_ = string_last_index_of_char (_tmp38_, (gunichar) '.', 0);
-#line 537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	index = _tmp39_;
+	_tmp41_ = iter;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp42_ = _ ("JPEG (compressed)");
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp40_, &_tmp41_, 0, _tmp42_, 1, ".jpg", -1, -1);
 #line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp40_ = index;
+	_tmp43_ = _data1_->file_type_store;
 #line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp40_ >= 0) {
-#line 2515 "ui.c"
-		const gchar* _tmp41_ = NULL;
-		gint _tmp42_ = 0;
-		gchar* _tmp43_ = NULL;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp41_ = self->priv->_default_file_name;
+	gtk_list_store_append (_tmp43_, &_tmp44_);
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp44_;
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp42_ = index;
+	_tmp45_ = _data1_->file_type_store;
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp43_ = string_substring (_tmp41_, (glong) _tmp42_, (glong) (-1));
+	_tmp46_ = iter;
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (default_extension);
+	_tmp47_ = _ ("PNG (lossless)");
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		default_extension = _tmp43_;
-#line 2529 "ui.c"
-	}
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp44_ = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING, -1);
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	file_type_store = _tmp44_;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp45_ = file_type_store;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp45_, &_tmp46_);
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp46_;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp47_ = file_type_store;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp48_ = iter;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp49_ = _ ("PDF (multi-page document)");
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp47_, &_tmp48_, 0, _tmp49_, 1, ".pdf", -1, -1);
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp50_ = file_type_store;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp50_, &_tmp51_);
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp51_;
+	gtk_list_store_set (_tmp45_, &_tmp46_, 0, _tmp47_, 1, ".png", -1, -1);
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp48_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp48_);
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	box = _tmp48_;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp49_ = box;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp49_, TRUE);
+#line 547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp50_ = self->priv->save_dialog;
+#line 547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp51_ = box;
+#line 547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_chooser_set_extra_widget ((GtkFileChooser*) _tmp50_, (GtkWidget*) _tmp51_);
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp52_ = file_type_store;
+	_tmp52_ = _ ("File format:");
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp53_ = iter;
+	_tmp53_ = (GtkLabel*) gtk_label_new (_tmp52_);
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp54_ = _ ("JPEG (compressed)");
+	g_object_ref_sink (_tmp53_);
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp52_, &_tmp53_, 0, _tmp54_, 1, ".jpg", -1, -1);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp55_ = file_type_store;
+	label = _tmp53_;
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp54_ = label;
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp54_, TRUE);
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp55_ = box;
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp56_ = label;
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_start (_tmp55_, (GtkWidget*) _tmp56_, FALSE, FALSE, (guint) 0);
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp57_ = _data1_->file_type_store;
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp58_ = (GtkComboBox*) gtk_combo_box_new_with_model ((GtkTreeModel*) _tmp57_);
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp58_);
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data1_->file_type_combo = _tmp58_;
 #line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp55_, &_tmp56_);
+	_tmp59_ = _data1_->file_type_combo;
 #line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp56_;
+	gtk_widget_set_visible ((GtkWidget*) _tmp59_, TRUE);
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp57_ = file_type_store;
+	_tmp60_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp58_ = iter;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp59_ = _ ("PNG (lossless)");
+	g_object_ref_sink (_tmp60_);
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp57_, &_tmp58_, 0, _tmp59_, 1, ".png", -1, -1);
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp60_ = file_type_store;
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp61_ = (GtkTreeView*) gtk_tree_view_new_with_model ((GtkTreeModel*) _tmp60_);
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp61_);
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	file_type_view = _tmp61_;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp62_ = file_type_view;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_tree_view_set_headers_visible (_tmp62_, FALSE);
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp63_ = file_type_view;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_tree_view_set_rules_hint (_tmp63_, TRUE);
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp64_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp64_);
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp65_ = _tmp64_;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp66_ = gtk_tree_view_column_new_with_attributes ("", (GtkCellRenderer*) _tmp65_, "text", 0, NULL, NULL);
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp66_);
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp67_ = _tmp66_;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_tmp65_);
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	column = _tmp67_;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp68_ = file_type_view;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp69_ = column;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_tree_view_append_column (_tmp68_, _tmp69_);
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp70_ = expander;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp71_ = file_type_view;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_add ((GtkContainer*) _tmp70_, (GtkWidget*) _tmp71_);
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp72_ = file_type_store;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp74_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp72_, &_tmp73_);
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp73_;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp74_) {
-#line 2629 "ui.c"
-		{
-			gboolean _tmp75_ = FALSE;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp75_ = TRUE;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			while (TRUE) {
-#line 2636 "ui.c"
-				gchar* e = NULL;
-				GtkListStore* _tmp78_ = NULL;
-				GtkTreeIter _tmp79_ = {0};
-				const gchar* _tmp80_ = NULL;
-				const gchar* _tmp81_ = NULL;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (!_tmp75_) {
-#line 2644 "ui.c"
-					GtkListStore* _tmp76_ = NULL;
-					gboolean _tmp77_ = FALSE;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp76_ = file_type_store;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp77_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp76_, &iter);
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					if (!_tmp77_) {
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						break;
-#line 2655 "ui.c"
-					}
-				}
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp75_ = FALSE;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp78_ = file_type_store;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp79_ = iter;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				gtk_tree_model_get ((GtkTreeModel*) _tmp78_, &_tmp79_, 1, &e, -1, -1);
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp80_ = default_extension;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp81_ = e;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (g_strcmp0 (_tmp80_, _tmp81_) == 0) {
-#line 2672 "ui.c"
-					GtkTreeView* _tmp82_ = NULL;
-					GtkTreeSelection* _tmp83_ = NULL;
-					GtkTreeIter _tmp84_ = {0};
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp82_ = file_type_view;
+	renderer = _tmp60_;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp61_ = _data1_->file_type_combo;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp62_ = renderer;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp61_, (GtkCellRenderer*) _tmp62_, TRUE);
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp63_ = _data1_->file_type_combo;
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp64_ = renderer;
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp63_, (GtkCellRenderer*) _tmp64_, "text", 0);
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp65_ = _data1_->file_type_combo;
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_combo_box_set_active (_tmp65_, 0);
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp66_ = _data1_->file_type_combo;
+#line 561 "/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 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp83_ = gtk_tree_view_get_selection (_tmp82_);
+	_tmp67_ = box;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp84_ = iter;
+	_tmp68_ = _data1_->file_type_combo;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_tree_selection_select_iter (_tmp83_, &_tmp84_);
-#line 2684 "ui.c"
-				}
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (e);
-#line 2688 "ui.c"
-			}
-		}
-	}
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp85_ = file_type_view;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp86_ = gtk_tree_view_get_selection (_tmp85_);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp86_, "changed", (GCallback) _user_interface_on_file_type_changed_gtk_tree_selection_changed, self, 0);
+	gtk_box_pack_start (_tmp67_, (GtkWidget*) _tmp68_, FALSE, FALSE, (guint) 0);
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp69_ = self->priv->save_dialog;
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp70_ = gtk_dialog_run ((GtkDialog*) _tmp69_);
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	response = _tmp70_;
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	uri = NULL;
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp87_ = expander;
+	_tmp71_ = response;
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show_all ((GtkWidget*) _tmp87_);
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp88_ = self->priv->save_dialog;
+	if (_tmp71_ == ((gint) GTK_RESPONSE_ACCEPT)) {
+#line 2600 "ui.c"
+		gchar* extension = NULL;
+		gchar* _tmp72_ = NULL;
+		GtkTreeIter i = {0};
+		GtkComboBox* _tmp73_ = NULL;
+		GtkTreeIter _tmp74_ = {0};
+		gboolean _tmp75_ = FALSE;
+		gchar* path = NULL;
+		GtkFileChooserDialog* _tmp78_ = NULL;
+		gchar* _tmp79_ = NULL;
+		gchar* filename = NULL;
+		const gchar* _tmp80_ = NULL;
+		gchar* _tmp81_ = NULL;
+		gint extension_index = 0;
+		const gchar* _tmp82_ = NULL;
+		gint _tmp83_ = 0;
+		gint _tmp84_ = 0;
+		const gchar* _tmp88_ = NULL;
+		GFile* _tmp89_ = NULL;
+		GFile* _tmp90_ = NULL;
+		gchar* _tmp91_ = NULL;
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp89_ = gtk_dialog_run ((GtkDialog*) _tmp88_);
+		_tmp72_ = g_strdup ("");
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	response = _tmp89_;
+		extension = _tmp72_;
 #line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	uri = NULL;
+		_tmp73_ = _data1_->file_type_combo;
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp75_ = gtk_combo_box_get_active_iter (_tmp73_, &_tmp74_);
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		i = _tmp74_;
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_tmp75_) {
+#line 2633 "ui.c"
+			GtkListStore* _tmp76_ = NULL;
+			GtkTreeIter _tmp77_ = {0};
 #line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp90_ = response;
+			_tmp76_ = _data1_->file_type_store;
 #line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp90_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2714 "ui.c"
-		GtkTreeSelection* selection = NULL;
-		GtkTreeView* _tmp91_ = NULL;
-		GtkTreeSelection* _tmp92_ = NULL;
-		GtkTreeSelection* _tmp93_ = NULL;
-		gchar* extension = NULL;
-		GtkTreeSelection* _tmp94_ = NULL;
-		gchar* _tmp95_ = NULL;
-		gchar* path = NULL;
-		GtkFileChooserDialog* _tmp96_ = NULL;
-		gchar* _tmp97_ = NULL;
-		gchar* filename = NULL;
-		const gchar* _tmp98_ = NULL;
-		gchar* _tmp99_ = NULL;
-		gint extension_index = 0;
-		const gchar* _tmp100_ = NULL;
-		gint _tmp101_ = 0;
-		gint _tmp102_ = 0;
-		const gchar* _tmp106_ = NULL;
-		GFile* _tmp107_ = NULL;
-		GFile* _tmp108_ = NULL;
-		gchar* _tmp109_ = NULL;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp91_ = file_type_view;
+			_tmp77_ = i;
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gtk_tree_model_get ((GtkTreeModel*) _tmp76_, &_tmp77_, 1, &extension, -1, -1);
+#line 2642 "ui.c"
+		}
 #line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp92_ = gtk_tree_view_get_selection (_tmp91_);
+		_tmp78_ = self->priv->save_dialog;
 #line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp93_ = _g_object_ref0 (_tmp92_);
+		_tmp79_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp78_);
 #line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		selection = _tmp93_;
+		path = _tmp79_;
 #line 591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp94_ = selection;
+		_tmp80_ = path;
 #line 591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp95_ = user_interface_get_selected_extension (self, _tmp94_);
+		_tmp81_ = g_path_get_basename (_tmp80_);
 #line 591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		extension = _tmp95_;
+		filename = _tmp81_;
 #line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp96_ = self->priv->save_dialog;
+		_tmp82_ = filename;
 #line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp97_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp96_);
+		_tmp83_ = string_last_index_of_char (_tmp82_, (gunichar) '.', 0);
 #line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		path = _tmp97_;
+		extension_index = _tmp83_;
 #line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp98_ = path;
+		_tmp84_ = extension_index;
 #line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp99_ = g_path_get_basename (_tmp98_);
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		filename = _tmp99_;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp100_ = filename;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp101_ = string_last_index_of_char (_tmp100_, (gunichar) '.', 0);
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		extension_index = _tmp101_;
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp102_ = extension_index;
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp102_ < 0) {
-#line 2772 "ui.c"
-			const gchar* _tmp103_ = NULL;
-			const gchar* _tmp104_ = NULL;
-			gchar* _tmp105_ = NULL;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp103_ = path;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp104_ = extension;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp105_ = g_strconcat (_tmp103_, _tmp104_, NULL);
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_tmp84_ < 0) {
+#line 2666 "ui.c"
+			const gchar* _tmp85_ = NULL;
+			const gchar* _tmp86_ = NULL;
+			gchar* _tmp87_ = NULL;
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp85_ = path;
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp86_ = extension;
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp87_ = g_strconcat (_tmp85_, _tmp86_, NULL);
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (path);
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			path = _tmp105_;
-#line 2786 "ui.c"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			path = _tmp87_;
+#line 2680 "ui.c"
 		}
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp88_ = path;
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp89_ = g_file_new_for_path (_tmp88_);
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp90_ = _tmp89_;
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp91_ = g_file_get_uri (_tmp90_);
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (uri);
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		uri = _tmp91_;
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_tmp90_);
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (filename);
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (path);
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (extension);
+#line 2702 "ui.c"
+	}
 #line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp106_ = path;
-#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp107_ = g_file_new_for_path (_tmp106_);
+	_tmp92_ = self->priv->settings;
 #line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp108_ = _tmp107_;
+	_tmp93_ = self->priv->save_dialog;
 #line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp109_ = g_file_get_uri (_tmp108_);
+	_tmp94_ = gtk_file_chooser_get_current_folder ((GtkFileChooser*) _tmp93_);
 #line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (uri);
+	_tmp95_ = _tmp94_;
 #line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		uri = _tmp109_;
+	g_settings_set_string (_tmp92_, "save-directory", _tmp95_);
 #line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_tmp108_);
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (filename);
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (path);
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (extension);
-#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (selection);
-#line 2810 "ui.c"
-	}
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp110_ = self->priv->settings;
+	_g_free0 (_tmp95_);
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp96_ = self->priv->save_dialog;
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _tmp96_);
 #line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp111_ = self->priv->save_dialog;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp112_ = gtk_file_chooser_get_current_folder ((GtkFileChooser*) _tmp111_);
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp113_ = _tmp112_;
-#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_string (_tmp110_, "save-directory", _tmp113_);
+	_g_object_unref0 (self->priv->save_dialog);
 #line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (_tmp113_);
+	self->priv->save_dialog = NULL;
 #line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp114_ = file_type_view;
+	result = uri;
 #line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp115_ = gtk_tree_view_get_selection (_tmp114_);
+	_g_object_unref0 (renderer);
 #line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_parse_name ("changed", gtk_tree_selection_get_type (), &_tmp116_, NULL, FALSE);
+	_g_object_unref0 (label);
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (box);
 #line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_handlers_disconnect_matched (_tmp115_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp116_, 0, NULL, (GCallback) _user_interface_on_file_type_changed_gtk_tree_selection_changed, self);
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp117_ = self->priv->save_dialog;
-#line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _tmp117_);
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->save_dialog);
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->save_dialog = NULL;
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = uri;
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (column);
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (file_type_view);
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (file_type_store);
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (default_extension);
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (expander);
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (filter);
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (directory);
-#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	block1_data_unref (_data1_);
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data1_ = NULL;
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 2858 "ui.c"
+#line 2742 "ui.c"
 }
 
 
@@ -2879,199 +2763,199 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 	gchar* _tmp39_ = NULL;
 	Book* _tmp40_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_uri;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_ != NULL) {
-#line 2889 "ui.c"
+#line 2773 "ui.c"
 		gboolean _tmp2_ = FALSE;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = force_choose_location;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = !_tmp2_;
-#line 2895 "ui.c"
+#line 2779 "ui.c"
 	} else {
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = FALSE;
-#line 2899 "ui.c"
+#line 2783 "ui.c"
 	}
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 2903 "ui.c"
+#line 2787 "ui.c"
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->book_uri;
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_strdup (_tmp3_);
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp4_;
-#line 2914 "ui.c"
+#line 2798 "ui.c"
 	} else {
 		gchar* _tmp5_ = NULL;
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_choose_file_location (self);
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp5_;
-#line 2923 "ui.c"
+#line 2807 "ui.c"
 	}
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = uri;
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp6_ == NULL) {
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 2935 "ui.c"
+#line 2819 "ui.c"
 	}
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = uri;
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = g_file_new_for_uri (_tmp7_);
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file = _tmp8_;
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = uri;
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:624: Saving to '%s'", _tmp9_);
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:620: Saving to '%s'", _tmp9_);
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = uri;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = g_utf8_strdown (_tmp10_, (gssize) (-1));
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	uri_lower = _tmp11_;
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = g_strdup ("jpeg");
-#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	format = _tmp12_;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = uri_lower;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = g_str_has_suffix (_tmp13_, ".pdf");
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp14_) {
-#line 2963 "ui.c"
+#line 2847 "ui.c"
 		gchar* _tmp15_ = NULL;
-#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = g_strdup ("pdf");
-#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
-#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		format = _tmp15_;
-#line 2971 "ui.c"
+#line 2855 "ui.c"
 	} else {
 		const gchar* _tmp16_ = NULL;
 		gboolean _tmp17_ = FALSE;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = uri_lower;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = g_str_has_suffix (_tmp16_, ".ps");
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp17_) {
-#line 2981 "ui.c"
+#line 2865 "ui.c"
 			gchar* _tmp18_ = NULL;
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp18_ = g_strdup ("ps");
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (format);
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			format = _tmp18_;
-#line 2989 "ui.c"
+#line 2873 "ui.c"
 		} else {
 			const gchar* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
-#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp19_ = uri_lower;
-#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp20_ = g_str_has_suffix (_tmp19_, ".png");
-#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp20_) {
-#line 2999 "ui.c"
+#line 2883 "ui.c"
 				gchar* _tmp21_ = NULL;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = g_strdup ("png");
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (format);
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				format = _tmp21_;
-#line 3007 "ui.c"
+#line 2891 "ui.c"
 			} else {
 				gboolean _tmp22_ = FALSE;
 				const gchar* _tmp23_ = NULL;
 				gboolean _tmp24_ = FALSE;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp23_ = uri_lower;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp24_ = g_str_has_suffix (_tmp23_, ".tif");
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp24_) {
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = TRUE;
-#line 3020 "ui.c"
+#line 2904 "ui.c"
 				} else {
 					const gchar* _tmp25_ = NULL;
 					gboolean _tmp26_ = FALSE;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp25_ = uri_lower;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp26_ = g_str_has_suffix (_tmp25_, ".tiff");
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = _tmp26_;
-#line 3030 "ui.c"
+#line 2914 "ui.c"
 				}
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp22_) {
-#line 3034 "ui.c"
+#line 2918 "ui.c"
 					gchar* _tmp27_ = NULL;
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp27_ = g_strdup ("tiff");
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (format);
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					format = _tmp27_;
-#line 3042 "ui.c"
+#line 2926 "ui.c"
 				}
 			}
 		}
 	}
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_progress_dialog (self);
-#line 3049 "ui.c"
+#line 2933 "ui.c"
 	{
 		Book* _tmp28_ = NULL;
 		const gchar* _tmp29_ = NULL;
 		gint _tmp30_ = 0;
 		gint _tmp31_ = 0;
 		GFile* _tmp32_ = NULL;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp28_ = self->priv->_book;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp29_ = format;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp30_ = user_interface_get_quality (self);
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp31_ = _tmp30_;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp32_ = file;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_save (_tmp28_, _tmp29_, _tmp31_, _tmp32_, &_inner_error_);
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3070 "ui.c"
-			goto __catch16_g_error;
+#line 2954 "ui.c"
+			goto __catch17_g_error;
 		}
 	}
-	goto __finally16;
-	__catch16_g_error:
+	goto __finally17;
+	__catch17_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp33_ = NULL;
@@ -3079,86 +2963,86 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		const gchar* _tmp35_ = NULL;
 		GError* _tmp36_ = NULL;
 		const gchar* _tmp37_ = NULL;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_hide_progress_dialog (self);
-#line 645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp33_ = e;
-#line 645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp34_ = _tmp33_->message;
-#line 645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:645: Error saving file: %s", _tmp34_);
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:641: Error saving file: %s", _tmp34_);
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp35_ = _ ("Failed to save file");
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp36_ = e;
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp37_ = _tmp36_->message;
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error (self, _tmp35_, _tmp37_, FALSE);
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri_lower);
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3117 "ui.c"
+#line 3001 "ui.c"
 	}
-	__finally16:
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally17:
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri_lower);
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 634 "/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 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return FALSE;
-#line 3136 "ui.c"
+#line 3020 "ui.c"
 	}
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp38_ = uri;
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp39_ = g_strdup (_tmp38_);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->book_uri = _tmp39_;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp40_ = self->priv->_book;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_set_needs_saving (_tmp40_, FALSE);
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (format);
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (uri_lower);
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file);
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (uri);
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3162 "ui.c"
+#line 3046 "ui.c"
 }
 
 
@@ -3183,124 +3067,124 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 	gint _tmp14_ = 0;
 	GtkMessageDialog* _tmp15_ = NULL;
 	gint _tmp16_ = 0;
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (title != NULL, FALSE);
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (discard_label != NULL, FALSE);
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_get_needs_saving (_tmp0_);
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3205 "ui.c"
+#line 3089 "ui.c"
 	}
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = title;
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 659 "/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 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp4_);
-#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dialog = _tmp4_;
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = dialog;
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _ ("If you don't save, changes will be permanently lost.");
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_message_dialog_format_secondary_text (_tmp5_, "%s", _tmp6_);
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 667 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = dialog;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 667 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = discard_label;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 667 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_add_button ((GtkDialog*) _tmp7_, _tmp8_, (gint) GTK_RESPONSE_NO);
-#line 672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = dialog;
-#line 672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = _ ("_Cancel");
-#line 672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_add_button ((GtkDialog*) _tmp9_, _tmp10_, (gint) GTK_RESPONSE_CANCEL);
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = dialog;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = _ ("_Save");
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_add_button ((GtkDialog*) _tmp11_, _tmp12_, (gint) GTK_RESPONSE_YES);
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = dialog;
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = gtk_dialog_run ((GtkDialog*) _tmp13_);
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	response = _tmp14_;
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = dialog;
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _tmp15_);
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = response;
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (_tmp16_) {
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_YES:
-#line 3255 "ui.c"
+#line 3139 "ui.c"
 		{
 			gboolean _tmp17_ = FALSE;
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp17_ = user_interface_save_document (self, FALSE);
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp17_) {
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				result = TRUE;
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (dialog);
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
-#line 3268 "ui.c"
+#line 3152 "ui.c"
 			} else {
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				result = FALSE;
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 680 "/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 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
-#line 3276 "ui.c"
+#line 3160 "ui.c"
 			}
 		}
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_NO:
-#line 3281 "ui.c"
+#line 3165 "ui.c"
 		{
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			result = TRUE;
-#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 682 "/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 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
-#line 3289 "ui.c"
+#line 3173 "ui.c"
 		}
 		default:
 		{
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			result = FALSE;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 684 "/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 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
-#line 3299 "ui.c"
+#line 3183 "ui.c"
 		}
 	}
-#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
-#line 3304 "ui.c"
+#line 3188 "ui.c"
 }
 
 
@@ -3309,31 +3193,31 @@ static void user_interface_clear_document (UserInterface* self) {
 	Book* _tmp1_ = NULL;
 	GtkMenuItem* _tmp2_ = NULL;
 	GtkMenuItem* _tmp3_ = NULL;
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_clear (_tmp0_);
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_add_default_page (self);
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->book_uri = NULL;
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_set_needs_saving (_tmp1_, FALSE);
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->save_as_menuitem;
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp2_, FALSE);
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->copy_to_clipboard_menuitem;
-#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, FALSE);
-#line 3337 "ui.c"
+#line 3221 "ui.c"
 }
 
 
@@ -3343,60 +3227,60 @@ static void user_interface_new_document (UserInterface* self) {
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Save current document?");
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Discard Changes");
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_prompt_to_save (self, _tmp0_, _tmp1_);
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 3359 "ui.c"
+#line 3243 "ui.c"
 	}
-#line 710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = user_interface_get_scanning (self);
-#line 710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _tmp3_;
-#line 710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
-#line 3369 "ui.c"
+#line 3253 "ui.c"
 	}
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_clear_document (self);
-#line 3373 "ui.c"
+#line 3257 "ui.c"
 }
 
 
 static void user_interface_new_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document (self);
-#line 3384 "ui.c"
+#line 3268 "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 3391 "ui.c"
+#line 3275 "ui.c"
 }
 
 
 void user_interface_new_document_activate_cb (UserInterface* self) {
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document (self);
-#line 3400 "ui.c"
+#line 3284 "ui.c"
 }
 
 
@@ -3405,78 +3289,78 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar*
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp10_ = FALSE;
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (document_hint != NULL);
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = document_hint;
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->document_hint);
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->document_hint = _tmp1_;
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = document_hint;
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp2_, "text") == 0) {
-#line 3425 "ui.c"
+#line 3309 "ui.c"
 		GtkRadioMenuItem* _tmp3_ = NULL;
 		GtkRadioMenuItem* _tmp4_ = NULL;
 		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->text_button_menuitem;
-#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp3_, TRUE);
-#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->text_button_hb_menuitem;
-#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->text_menuitem;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
-#line 3441 "ui.c"
+#line 3325 "ui.c"
 	} else {
 		const gchar* _tmp6_ = NULL;
-#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = document_hint;
-#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (g_strcmp0 (_tmp6_, "photo") == 0) {
-#line 3448 "ui.c"
+#line 3332 "ui.c"
 			GtkRadioMenuItem* _tmp7_ = NULL;
 			GtkRadioMenuItem* _tmp8_ = NULL;
 			GtkRadioMenuItem* _tmp9_ = NULL;
-#line 738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp7_ = self->priv->photo_button_menuitem;
-#line 738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp7_, TRUE);
-#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp8_ = self->priv->photo_button_hb_menuitem;
-#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp8_, TRUE);
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = self->priv->photo_menuitem;
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp9_, TRUE);
-#line 3464 "ui.c"
+#line 3348 "ui.c"
 		}
 	}
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = save;
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp10_) {
-#line 3471 "ui.c"
+#line 3355 "ui.c"
 		GSettings* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = self->priv->settings;
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = document_hint;
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_settings_set_string (_tmp11_, "document-type", _tmp12_);
-#line 3480 "ui.c"
+#line 3364 "ui.c"
 	}
 }
 
@@ -3485,21 +3369,21 @@ static void user_interface_text_menuitem_toggled_cb (UserInterface* self, GtkChe
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, "text", TRUE);
-#line 3503 "ui.c"
+#line 3387 "ui.c"
 	}
 }
 
@@ -3507,7 +3391,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 3511 "ui.c"
+#line 3395 "ui.c"
 }
 
 
@@ -3515,21 +3399,21 @@ static void user_interface_photo_menuitem_toggled_cb (UserInterface* self, GtkCh
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 755 "/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 755 "/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 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 757 "/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 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, "photo", TRUE);
-#line 3533 "ui.c"
+#line 3417 "ui.c"
 	}
 }
 
@@ -3537,7 +3421,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 3541 "ui.c"
+#line 3425 "ui.c"
 }
 
 
@@ -3546,71 +3430,71 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 	GtkListStore* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_side_model;
-#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3560 "ui.c"
+#line 3444 "ui.c"
 		{
 			gboolean _tmp3_ = FALSE;
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = TRUE;
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 3567 "ui.c"
+#line 3451 "ui.c"
 				gint s = 0;
 				GtkListStore* _tmp6_ = NULL;
 				GtkTreeIter _tmp7_ = {0};
 				gint _tmp8_ = 0;
 				ScanType _tmp9_ = 0;
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp3_) {
-#line 3575 "ui.c"
+#line 3459 "ui.c"
 					GtkListStore* _tmp4_ = NULL;
 					gboolean _tmp5_ = FALSE;
-#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp4_ = self->priv->page_side_model;
-#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp5_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp4_, &iter);
-#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp5_) {
-#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 3586 "ui.c"
+#line 3470 "ui.c"
 					}
 				}
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp3_ = FALSE;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp6_ = self->priv->page_side_model;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = iter;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_tree_model_get ((GtkTreeModel*) _tmp6_, &_tmp7_, 0, &s, -1, -1);
-#line 771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = s;
-#line 771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = page_side;
-#line 771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp8_ == ((gint) _tmp9_)) {
-#line 3603 "ui.c"
+#line 3487 "ui.c"
 					GtkComboBox* _tmp10_ = NULL;
 					GtkTreeIter _tmp11_ = {0};
-#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp10_ = self->priv->page_side_combo;
-#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp11_ = iter;
-#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_combo_box_set_active_iter (_tmp10_, &_tmp11_);
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					return;
-#line 3614 "ui.c"
+#line 3498 "ui.c"
 				}
 			}
 		}
@@ -3623,27 +3507,27 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 	gboolean have_iter = FALSE;
 	gboolean _tmp14_ = FALSE;
 	gboolean _tmp18_ = FALSE;
-#line 780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 3629 "ui.c"
+#line 3513 "ui.c"
 	{
 		GtkListStore* _tmp0_ = NULL;
 		GtkTreeIter _tmp1_ = {0};
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
-#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = self->priv->paper_size_model;
-#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp1_;
-#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_iter = _tmp2_;
-#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = TRUE;
-#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		while (TRUE) {
-#line 3647 "ui.c"
+#line 3531 "ui.c"
 			gboolean _tmp6_ = FALSE;
 			gint w = 0;
 			gint h = 0;
@@ -3652,96 +3536,96 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 			gboolean _tmp9_ = FALSE;
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
-#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (!_tmp3_) {
-#line 3658 "ui.c"
+#line 3542 "ui.c"
 				GtkListStore* _tmp4_ = NULL;
 				gboolean _tmp5_ = FALSE;
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp4_ = self->priv->paper_size_model;
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp5_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp4_, &iter);
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				have_iter = _tmp5_;
-#line 3667 "ui.c"
+#line 3551 "ui.c"
 			}
-#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = FALSE;
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp6_ = have_iter;
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (!_tmp6_) {
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 3677 "ui.c"
+#line 3561 "ui.c"
 			}
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp7_ = self->priv->paper_size_model;
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp8_ = iter;
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_tree_model_get ((GtkTreeModel*) _tmp7_, &_tmp8_, 0, &w, 1, &h, -1, -1);
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = w;
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = width;
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp10_ == _tmp11_) {
-#line 3691 "ui.c"
+#line 3575 "ui.c"
 				gint _tmp12_ = 0;
 				gint _tmp13_ = 0;
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = h;
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp13_ = height;
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = _tmp12_ == _tmp13_;
-#line 3700 "ui.c"
+#line 3584 "ui.c"
 			} else {
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = FALSE;
-#line 3704 "ui.c"
+#line 3588 "ui.c"
 			}
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp9_) {
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 3710 "ui.c"
+#line 3594 "ui.c"
 			}
 		}
 	}
-#line 795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = have_iter;
-#line 795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp14_) {
-#line 3718 "ui.c"
+#line 3602 "ui.c"
 		GtkListStore* _tmp15_ = NULL;
 		GtkTreeIter _tmp16_ = {0};
 		gboolean _tmp17_ = FALSE;
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = self->priv->paper_size_model;
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp15_, &_tmp16_);
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp16_;
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_iter = _tmp17_;
-#line 3730 "ui.c"
+#line 3614 "ui.c"
 	}
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = have_iter;
-#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp18_) {
-#line 3736 "ui.c"
+#line 3620 "ui.c"
 		GtkComboBox* _tmp19_ = NULL;
 		GtkTreeIter _tmp20_ = {0};
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = self->priv->paper_size_combo;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp20_ = iter;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_combo_box_set_active_iter (_tmp19_, &_tmp20_);
-#line 3745 "ui.c"
+#line 3629 "ui.c"
 	}
 }
 
@@ -3753,34 +3637,34 @@ static gint user_interface_get_text_dpi (UserInterface* self) {
 	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->text_dpi_combo;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3769 "ui.c"
+#line 3653 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->text_dpi_model;
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
-#line 3778 "ui.c"
+#line 3662 "ui.c"
 	}
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = dpi;
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3784 "ui.c"
+#line 3668 "ui.c"
 }
 
 
@@ -3791,34 +3675,34 @@ static gint user_interface_get_photo_dpi (UserInterface* self) {
 	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-#line 817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->photo_dpi_combo;
-#line 817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3807 "ui.c"
+#line 3691 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->photo_dpi_model;
-#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
-#line 3816 "ui.c"
+#line 3700 "ui.c"
 	}
-#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = dpi;
-#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3822 "ui.c"
+#line 3706 "ui.c"
 }
 
 
@@ -3830,36 +3714,36 @@ static ScanType user_interface_get_page_side (UserInterface* self) {
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
 	gint _tmp5_ = 0;
-#line 823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_side = (gint) SCAN_TYPE_ADF_BOTH;
-#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_side_combo;
-#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3846 "ui.c"
+#line 3730 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->page_side_model;
-#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &page_side, -1, -1);
-#line 3855 "ui.c"
+#line 3739 "ui.c"
 	}
-#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page_side;
-#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = (ScanType) _tmp5_;
-#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3863 "ui.c"
+#line 3747 "ui.c"
 }
 
 
@@ -3872,66 +3756,66 @@ static gboolean user_interface_get_paper_size (UserInterface* self, gint* width,
 	GtkComboBox* _tmp1_ = NULL;
 	GtkTreeIter _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_height = 0;
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _vala_height;
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_width = _tmp0_;
-#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->paper_size_combo;
-#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = gtk_combo_box_get_active_iter (_tmp1_, &_tmp2_);
-#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp2_;
-#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 3892 "ui.c"
+#line 3776 "ui.c"
 		GtkListStore* _tmp4_ = NULL;
 		GtkTreeIter _tmp5_ = {0};
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->paper_size_model;
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = iter;
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 837 "/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 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (width) {
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*width = _vala_width;
-#line 3907 "ui.c"
+#line 3791 "ui.c"
 		}
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (height) {
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*height = _vala_height;
-#line 3913 "ui.c"
+#line 3797 "ui.c"
 		}
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3917 "ui.c"
+#line 3801 "ui.c"
 	}
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (width) {
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*width = _vala_width;
-#line 3925 "ui.c"
+#line 3809 "ui.c"
 	}
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (height) {
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*height = _vala_height;
-#line 3931 "ui.c"
+#line 3815 "ui.c"
 	}
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3935 "ui.c"
+#line 3819 "ui.c"
 }
 
 
@@ -3950,88 +3834,88 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) {
 	ScanOptions* _tmp17_ = NULL;
 	gint _tmp18_ = 0;
 	gint _tmp19_ = 0;
-#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = scan_options_new ();
-#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options = _tmp0_;
-#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->document_hint;
-#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp1_, "text") == 0) {
-#line 3964 "ui.c"
+#line 3848 "ui.c"
 		ScanOptions* _tmp2_ = NULL;
 		ScanOptions* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 		ScanOptions* _tmp5_ = NULL;
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = options;
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_->scan_mode = SCAN_MODE_GRAY;
-#line 854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = options;
-#line 854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = user_interface_get_text_dpi (self);
-#line 854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_->dpi = _tmp4_;
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = options;
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_->depth = 2;
-#line 3983 "ui.c"
+#line 3867 "ui.c"
 	} else {
 		ScanOptions* _tmp6_ = NULL;
 		ScanOptions* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
 		ScanOptions* _tmp9_ = NULL;
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = options;
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_->scan_mode = SCAN_MODE_COLOR;
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = options;
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = user_interface_get_photo_dpi (self);
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_->dpi = _tmp8_;
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = options;
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_->depth = 8;
-#line 4003 "ui.c"
+#line 3887 "ui.c"
 	}
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = options;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = options;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_get_paper_size (self, &_tmp12_, &_tmp13_);
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_->paper_width = _tmp12_;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_->paper_height = _tmp13_;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = options;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = user_interface_get_brightness (self);
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = _tmp15_;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_->brightness = _tmp16_;
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = options;
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = user_interface_get_contrast (self);
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = _tmp18_;
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_->contrast = _tmp19_;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = options;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 4035 "ui.c"
+#line 3919 "ui.c"
 }
 
 
@@ -4041,73 +3925,73 @@ static void user_interface_scan_button_clicked_cb (UserInterface* self, GtkWidge
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_make_scan_options (self);
-#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options = _tmp0_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options->type = SCAN_TYPE_SINGLE;
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_selected_device (self);
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "start-scan", _tmp3_, options);
-#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (_tmp3_);
 #line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (_tmp3_);
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_options_unref0 (options);
-#line 4067 "ui.c"
+#line 3951 "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 4074 "ui.c"
+#line 3958 "ui.c"
 }
 
 
 static void user_interface_stop_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "stop-scan");
-#line 4085 "ui.c"
+#line 3969 "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 4092 "ui.c"
+#line 3976 "ui.c"
 }
 
 
 static void user_interface_continuous_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_get_scanning (self);
-#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_;
-#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
-#line 888 "/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 4111 "ui.c"
+#line 3995 "ui.c"
 	} else {
 		ScanOptions* options = NULL;
 		ScanOptions* _tmp2_ = NULL;
@@ -4117,31 +4001,31 @@ static void user_interface_continuous_scan_button_clicked_cb (UserInterface* sel
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		ScanOptions* _tmp8_ = NULL;
-#line 891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = user_interface_make_scan_options (self);
-#line 891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		options = _tmp2_;
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = options;
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = user_interface_get_page_side (self);
-#line 892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_->type = _tmp4_;
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_selected_device (self);
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _tmp6_;
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = options;
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "start-scan", _tmp7_, _tmp8_);
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp7_);
-#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_scan_options_unref0 (options);
-#line 4145 "ui.c"
+#line 4029 "ui.c"
 	}
 }
 
@@ -4149,56 +4033,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 4153 "ui.c"
+#line 4037 "ui.c"
 }
 
 
 static void user_interface_preferences_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
 	GtkDialog* _tmp0_ = NULL;
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present ((GtkWindow*) _tmp0_);
-#line 4167 "ui.c"
+#line 4051 "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 4174 "ui.c"
+#line 4058 "ui.c"
 }
 
 
 void user_interface_preferences_activate_cb (UserInterface* self) {
 	GtkDialog* _tmp0_ = NULL;
-#line 903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present ((GtkWindow*) _tmp0_);
-#line 4186 "ui.c"
+#line 4070 "ui.c"
 }
 
 
 static gboolean user_interface_preferences_dialog_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event) {
 	gboolean result = FALSE;
-#line 909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 4202 "ui.c"
+#line 4086 "ui.c"
 }
 
 
@@ -4207,35 +4091,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 4211 "ui.c"
+#line 4095 "ui.c"
 }
 
 
 static void user_interface_preferences_dialog_response_cb (UserInterface* self, GtkWidget* widget, gint response_id) {
 	GtkDialog* _tmp0_ = NULL;
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 4225 "ui.c"
+#line 4109 "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 4232 "ui.c"
+#line 4116 "ui.c"
 }
 
 
 static gpointer _page_ref0 (gpointer self) {
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? page_ref (self) : NULL;
-#line 4239 "ui.c"
+#line 4123 "ui.c"
 }
 
 
@@ -4246,34 +4130,34 @@ static void user_interface_update_page_menu (UserInterface* self) {
 	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 919 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ == NULL) {
-#line 4266 "ui.c"
+#line 4150 "ui.c"
 		GtkMenuItem* _tmp5_ = NULL;
 		GtkMenuItem* _tmp6_ = NULL;
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->page_move_left_menuitem;
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp5_, FALSE);
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = self->priv->page_move_right_menuitem;
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp6_, FALSE);
-#line 4277 "ui.c"
+#line 4161 "ui.c"
 	} else {
 		guint index = 0U;
 		Book* _tmp7_ = NULL;
@@ -4286,37 +4170,37 @@ static void user_interface_update_page_menu (UserInterface* self) {
 		Book* _tmp14_ = NULL;
 		guint _tmp15_ = 0U;
 		guint _tmp16_ = 0U;
-#line 930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = self->priv->_book;
-#line 930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = page;
-#line 930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = book_get_page_index (_tmp7_, _tmp8_);
-#line 930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		index = _tmp9_;
-#line 931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = self->priv->page_move_left_menuitem;
-#line 931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = index;
-#line 931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp10_, _tmp11_ > ((guint) 0));
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = self->priv->page_move_right_menuitem;
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = index;
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = self->priv->_book;
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = book_get_n_pages (_tmp14_);
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = _tmp15_;
-#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp12_, _tmp13_ < (_tmp16_ - 1));
-#line 4316 "ui.c"
+#line 4200 "ui.c"
 	}
-#line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4320 "ui.c"
+#line 4204 "ui.c"
 }
 
 
@@ -4337,165 +4221,165 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 	Page* _tmp37_ = NULL;
 	gboolean _tmp38_ = FALSE;
 	gboolean _tmp39_ = FALSE;
-#line 936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_ == NULL) {
-#line 939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4351 "ui.c"
+#line 4235 "ui.c"
 	}
-#line 941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->updating_page_menu = TRUE;
-#line 943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->no_crop_menuitem;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	menuitem = _tmp2_;
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page;
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_get_has_crop (_tmp3_);
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_) {
-#line 4371 "ui.c"
+#line 4255 "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 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = page_get_crop_name (_tmp6_);
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = g_strdup (_tmp8_);
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		crop_name = _tmp9_;
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = crop_name;
-#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp10_ != NULL) {
-#line 4392 "ui.c"
+#line 4276 "ui.c"
 			const gchar* _tmp11_ = NULL;
-#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = crop_name;
-#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (g_strcmp0 (_tmp11_, "A4") == 0) {
-#line 4398 "ui.c"
+#line 4282 "ui.c"
 				GtkRadioMenuItem* _tmp12_ = NULL;
 				GtkRadioMenuItem* _tmp13_ = NULL;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = self->priv->a4_menuitem;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (menuitem);
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				menuitem = _tmp13_;
-#line 4409 "ui.c"
+#line 4293 "ui.c"
 			} else {
 				const gchar* _tmp14_ = NULL;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp14_ = crop_name;
-#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (g_strcmp0 (_tmp14_, "A5") == 0) {
-#line 4416 "ui.c"
+#line 4300 "ui.c"
 					GtkRadioMenuItem* _tmp15_ = NULL;
 					GtkRadioMenuItem* _tmp16_ = NULL;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp15_ = self->priv->a5_menuitem;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 950 "/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 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					menuitem = _tmp16_;
-#line 4427 "ui.c"
+#line 4311 "ui.c"
 				} else {
 					const gchar* _tmp17_ = NULL;
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp17_ = crop_name;
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (g_strcmp0 (_tmp17_, "A6") == 0) {
-#line 4434 "ui.c"
+#line 4318 "ui.c"
 						GtkRadioMenuItem* _tmp18_ = NULL;
 						GtkRadioMenuItem* _tmp19_ = NULL;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp18_ = self->priv->a6_menuitem;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 952 "/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 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						menuitem = _tmp19_;
-#line 4445 "ui.c"
+#line 4329 "ui.c"
 					} else {
 						const gchar* _tmp20_ = NULL;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp20_ = crop_name;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						if (g_strcmp0 (_tmp20_, "letter") == 0) {
-#line 4452 "ui.c"
+#line 4336 "ui.c"
 							GtkRadioMenuItem* _tmp21_ = NULL;
 							GtkRadioMenuItem* _tmp22_ = NULL;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp21_ = self->priv->letter_menuitem;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp22_ = _g_object_ref0 (_tmp21_);
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 954 "/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 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							menuitem = _tmp22_;
-#line 4463 "ui.c"
+#line 4347 "ui.c"
 						} else {
 							const gchar* _tmp23_ = NULL;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp23_ = crop_name;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (g_strcmp0 (_tmp23_, "legal") == 0) {
-#line 4470 "ui.c"
+#line 4354 "ui.c"
 								GtkRadioMenuItem* _tmp24_ = NULL;
 								GtkRadioMenuItem* _tmp25_ = NULL;
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp24_ = self->priv->legal_menuitem;
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp25_ = _g_object_ref0 (_tmp24_);
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 956 "/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 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								menuitem = _tmp25_;
-#line 4481 "ui.c"
+#line 4365 "ui.c"
 							} else {
 								const gchar* _tmp26_ = NULL;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp26_ = crop_name;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								if (g_strcmp0 (_tmp26_, "4x6") == 0) {
-#line 4488 "ui.c"
+#line 4372 "ui.c"
 									GtkRadioMenuItem* _tmp27_ = NULL;
 									GtkRadioMenuItem* _tmp28_ = NULL;
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									_tmp27_ = self->priv->four_by_six_menuitem;
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 958 "/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 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									menuitem = _tmp28_;
-#line 4499 "ui.c"
+#line 4383 "ui.c"
 								}
 							}
 						}
@@ -4505,49 +4389,49 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 		} else {
 			GtkRadioMenuItem* _tmp29_ = NULL;
 			GtkRadioMenuItem* _tmp30_ = NULL;
-#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp29_ = self->priv->custom_crop_menuitem;
-#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp30_ = _g_object_ref0 (_tmp29_);
-#line 965 "/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 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			menuitem = _tmp30_;
-#line 4517 "ui.c"
+#line 4401 "ui.c"
 		}
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (crop_name);
-#line 4521 "ui.c"
+#line 4405 "ui.c"
 	}
-#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = menuitem;
-#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp31_, TRUE);
-#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = self->priv->crop_button;
-#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = page;
-#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp34_ = page_get_has_crop (_tmp33_);
-#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = _tmp34_;
-#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_toggle_button_set_active (_tmp32_, _tmp35_);
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp36_ = self->priv->crop_toolbutton;
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp37_ = page;
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp38_ = page_get_has_crop (_tmp37_);
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp39_ = _tmp38_;
-#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_toggle_tool_button_set_active (_tmp36_, _tmp39_);
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->updating_page_menu = FALSE;
-#line 936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (menuitem);
-#line 4551 "ui.c"
+#line 4435 "ui.c"
 }
 
 
@@ -4559,97 +4443,97 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 	const gchar* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = get_temporary_filename ("scanned-page", "tiff");
-#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	path = _tmp0_;
-#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = path;
-#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_ == NULL) {
-#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4581 "ui.c"
+#line 4465 "ui.c"
 	}
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = path;
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_file_new_for_path (_tmp2_);
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file = _tmp3_;
-#line 4589 "ui.c"
+#line 4473 "ui.c"
 	{
 		Page* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		GFile* _tmp7_ = NULL;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = page;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_quality (self);
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = file;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_save (_tmp4_, "tiff", _tmp6_, _tmp7_, &_inner_error_);
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4607 "ui.c"
-			goto __catch17_g_error;
+#line 4491 "ui.c"
+			goto __catch18_g_error;
 		}
 	}
-	goto __finally17;
-	__catch17_g_error:
+	goto __finally18;
+	__catch18_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp8_ = NULL;
 		GError* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _ ("Unable to save image for preview");
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = e;
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = _tmp9_->message;
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp8_, _tmp10_);
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4638 "ui.c"
+#line 4522 "ui.c"
 	}
-	__finally17:
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally18:
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 982 "/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 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 978 "/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 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4653 "ui.c"
+#line 4537 "ui.c"
 	}
 	{
 		GdkScreen* _tmp11_ = NULL;
@@ -4658,88 +4542,88 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
 		guint32 _tmp16_ = 0U;
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = gtk_window_get_screen ((GtkWindow*) self);
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = _tmp11_;
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = file;
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = g_file_get_uri (_tmp13_);
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = _tmp14_;
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = gtk_get_current_event_time ();
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_show_uri (_tmp12_, _tmp15_, _tmp16_, &_inner_error_);
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp15_);
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4680 "ui.c"
-			goto __catch18_g_error;
+#line 4564 "ui.c"
+			goto __catch19_g_error;
 		}
 	}
-	goto __finally18;
-	__catch18_g_error:
+	goto __finally19;
+	__catch19_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp17_ = NULL;
 		GError* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
-#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = _ ("Unable to open image preview application");
-#line 1000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp18_ = e;
-#line 1000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = _tmp18_->message;
-#line 1000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp17_, _tmp19_);
-#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 4705 "ui.c"
+#line 4589 "ui.c"
 	}
-	__finally18:
-#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally19:
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 990 "/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 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4720 "ui.c"
+#line 4604 "ui.c"
 	}
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file);
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (path);
-#line 4726 "ui.c"
+#line 4610 "ui.c"
 }
 
 
 static void user_interface_show_page_menu_cb (UserInterface* self, BookView* view) {
 	GtkMenu* _tmp0_ = NULL;
 	guint32 _tmp1_ = 0U;
-#line 1006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1002 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_menu;
-#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_get_current_event_time ();
-#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1004 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, (guint) 3, _tmp1_);
-#line 4743 "ui.c"
+#line 4627 "ui.c"
 }
 
 
@@ -4751,50 +4635,50 @@ static void user_interface_rotate_left_button_clicked_cb (UserInterface* self, G
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4765 "ui.c"
+#line 4649 "ui.c"
 	}
-#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
-#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_view_get_selected_page (_tmp1_);
-#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _page_ref0 (_tmp3_);
-#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp4_;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ != NULL) {
-#line 4781 "ui.c"
+#line 4665 "ui.c"
 		Page* _tmp6_ = NULL;
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_rotate_left (_tmp6_);
-#line 4787 "ui.c"
+#line 4671 "ui.c"
 	}
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4791 "ui.c"
+#line 4675 "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 4798 "ui.c"
+#line 4682 "ui.c"
 }
 
 
@@ -4806,50 +4690,50 @@ static void user_interface_rotate_right_button_clicked_cb (UserInterface* self,
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4820 "ui.c"
+#line 4704 "ui.c"
 	}
-#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
-#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_view_get_selected_page (_tmp1_);
-#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _page_ref0 (_tmp3_);
-#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp4_;
-#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ != NULL) {
-#line 4836 "ui.c"
+#line 4720 "ui.c"
 		Page* _tmp6_ = NULL;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_rotate_right (_tmp6_);
-#line 4842 "ui.c"
+#line 4726 "ui.c"
 	}
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4846 "ui.c"
+#line 4730 "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 4853 "ui.c"
+#line 4737 "ui.c"
 }
 
 
@@ -4864,62 +4748,62 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 	Page* _tmp6_ = NULL;
 	Page* _tmp7_ = NULL;
 	const gchar* _tmp8_ = NULL;
-#line 1031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->crop_rotate_menuitem;
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = crop_name;
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp1_ != NULL);
-#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->updating_page_menu;
-#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4882 "ui.c"
+#line 4766 "ui.c"
 	}
-#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book_view;
-#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book_view_get_selected_page (_tmp3_);
-#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _page_ref0 (_tmp5_);
-#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp6_;
-#line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = page;
-#line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ == NULL) {
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1041: Trying to set crop but no selected page");
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:1037: Trying to set crop but no selected page");
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (page);
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4904 "ui.c"
+#line 4788 "ui.c"
 	}
-#line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = crop_name;
-#line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp8_ == NULL) {
-#line 4910 "ui.c"
+#line 4794 "ui.c"
 		Page* _tmp9_ = NULL;
-#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = page;
-#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_set_no_crop (_tmp9_);
-#line 4916 "ui.c"
+#line 4800 "ui.c"
 	} else {
 		const gchar* _tmp10_ = NULL;
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = crop_name;
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (g_strcmp0 (_tmp10_, "custom") == 0) {
-#line 4923 "ui.c"
+#line 4807 "ui.c"
 			gint width = 0;
 			Page* _tmp11_ = NULL;
 			gint _tmp12_ = 0;
@@ -4940,66 +4824,66 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 			gint _tmp24_ = 0;
 			gint _tmp25_ = 0;
 			gint _tmp26_ = 0;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = page;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp12_ = page_get_width (_tmp11_);
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp13_ = _tmp12_;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			width = _tmp13_;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp14_ = page;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp15_ = page_get_height (_tmp14_);
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp16_ = _tmp15_;
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			height = _tmp16_;
-#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp17_ = width;
-#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			crop_width = (gint) ((_tmp17_ * 0.8) + 0.5);
-#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp18_ = height;
-#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			crop_height = (gint) ((_tmp18_ * 0.8) + 0.5);
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp19_ = page;
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp20_ = crop_width;
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp21_ = crop_height;
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_set_custom_crop (_tmp19_, _tmp20_, _tmp21_);
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp22_ = page;
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp23_ = width;
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp24_ = crop_width;
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp25_ = height;
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp26_ = crop_height;
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_move_crop (_tmp22_, (_tmp23_ - _tmp24_) / 2, (_tmp25_ - _tmp26_) / 2);
-#line 4988 "ui.c"
+#line 4872 "ui.c"
 		} else {
 			Page* _tmp27_ = NULL;
 			const gchar* _tmp28_ = NULL;
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp27_ = page;
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp28_ = crop_name;
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_set_named_crop (_tmp27_, _tmp28_);
-#line 4998 "ui.c"
+#line 4882 "ui.c"
 		}
 	}
-#line 1031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5003 "ui.c"
+#line 4887 "ui.c"
 }
 
 
@@ -5007,21 +4891,21 @@ static void user_interface_no_crop_menuitem_toggled_cb (UserInterface* self, Gtk
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, NULL);
-#line 5025 "ui.c"
+#line 4909 "ui.c"
 	}
 }
 
@@ -5029,7 +4913,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 5033 "ui.c"
+#line 4917 "ui.c"
 }
 
 
@@ -5037,21 +4921,21 @@ static void user_interface_custom_crop_menuitem_toggled_cb (UserInterface* self,
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1068 "/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 1068 "/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 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1070 "/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 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "custom");
-#line 5055 "ui.c"
+#line 4939 "ui.c"
 	}
 }
 
@@ -5059,7 +4943,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 5063 "ui.c"
+#line 4947 "ui.c"
 }
 
 
@@ -5068,40 +4952,40 @@ static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggl
 	GtkToggleButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 1075 "/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 1075 "/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 1077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5082 "ui.c"
+#line 4966 "ui.c"
 	}
-#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = widget;
-#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_toggle_button_get_active (_tmp1_);
-#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 5092 "ui.c"
+#line 4976 "ui.c"
 		GtkRadioMenuItem* _tmp4_ = NULL;
-#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->custom_crop_menuitem;
-#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 5098 "ui.c"
+#line 4982 "ui.c"
 	} else {
 		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->no_crop_menuitem;
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
-#line 5105 "ui.c"
+#line 4989 "ui.c"
 	}
 }
 
@@ -5109,7 +4993,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 5113 "ui.c"
+#line 4997 "ui.c"
 }
 
 
@@ -5118,40 +5002,40 @@ static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkT
 	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5132 "ui.c"
+#line 5016 "ui.c"
 	}
-#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = widget;
-#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 5142 "ui.c"
+#line 5026 "ui.c"
 		GtkRadioMenuItem* _tmp4_ = NULL;
-#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->custom_crop_menuitem;
-#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 5148 "ui.c"
+#line 5032 "ui.c"
 	} else {
 		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->no_crop_menuitem;
-#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
-#line 5155 "ui.c"
+#line 5039 "ui.c"
 	}
 }
 
@@ -5159,7 +5043,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 5163 "ui.c"
+#line 5047 "ui.c"
 }
 
 
@@ -5167,21 +5051,21 @@ static void user_interface_four_by_six_menuitem_toggled_cb (UserInterface* self,
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "4x6");
-#line 5185 "ui.c"
+#line 5069 "ui.c"
 	}
 }
 
@@ -5189,7 +5073,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 5193 "ui.c"
+#line 5077 "ui.c"
 }
 
 
@@ -5197,21 +5081,21 @@ static void user_interface_legal_menuitem_toggled_cb (UserInterface* self, GtkCh
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1106 "/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 1106 "/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 1108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1108 "/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 1108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "legal");
-#line 5215 "ui.c"
+#line 5099 "ui.c"
 	}
 }
 
@@ -5219,7 +5103,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 5223 "ui.c"
+#line 5107 "ui.c"
 }
 
 
@@ -5227,21 +5111,21 @@ static void user_interface_letter_menuitem_toggled_cb (UserInterface* self, GtkC
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1113 "/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 1113 "/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 1115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1115 "/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 1115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "letter");
-#line 5245 "ui.c"
+#line 5129 "ui.c"
 	}
 }
 
@@ -5249,7 +5133,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 5253 "ui.c"
+#line 5137 "ui.c"
 }
 
 
@@ -5257,21 +5141,21 @@ static void user_interface_a6_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1120 "/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 1120 "/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 1122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1122 "/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 1122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A6");
-#line 5275 "ui.c"
+#line 5159 "ui.c"
 	}
 }
 
@@ -5279,7 +5163,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 5283 "ui.c"
+#line 5167 "ui.c"
 }
 
 
@@ -5287,21 +5171,21 @@ static void user_interface_a5_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1127 "/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 1127 "/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 1129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1129 "/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 1129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A5");
-#line 5305 "ui.c"
+#line 5189 "ui.c"
 	}
 }
 
@@ -5309,7 +5193,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 5313 "ui.c"
+#line 5197 "ui.c"
 }
 
 
@@ -5317,21 +5201,21 @@ static void user_interface_a4_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1134 "/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 1134 "/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 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1136 "/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 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A4");
-#line 5335 "ui.c"
+#line 5219 "ui.c"
 	}
 }
 
@@ -5339,7 +5223,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 5343 "ui.c"
+#line 5227 "ui.c"
 }
 
 
@@ -5351,44 +5235,44 @@ static void user_interface_crop_rotate_menuitem_activate_cb (UserInterface* self
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1141 "/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 1141 "/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 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ == NULL) {
-#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (page);
-#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5377 "ui.c"
+#line 5261 "ui.c"
 	}
-#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_rotate_crop (_tmp5_);
-#line 1141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5385 "ui.c"
+#line 5269 "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 5392 "ui.c"
+#line 5276 "ui.c"
 }
 
 
@@ -5403,56 +5287,56 @@ static void user_interface_page_move_left_menuitem_activate_cb (UserInterface* s
 	Page* _tmp5_ = NULL;
 	guint _tmp6_ = 0U;
 	guint _tmp7_ = 0U;
-#line 1150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->_book;
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_page_index (_tmp4_, _tmp5_);
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = _tmp6_;
-#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = index;
-#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ > ((guint) 0)) {
-#line 5433 "ui.c"
+#line 5317 "ui.c"
 		Book* _tmp8_ = NULL;
 		Page* _tmp9_ = NULL;
 		guint _tmp10_ = 0U;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = self->priv->_book;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = page;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = index;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_move_page (_tmp8_, _tmp9_, _tmp10_ - 1);
-#line 5445 "ui.c"
+#line 5329 "ui.c"
 	}
-#line 1150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5449 "ui.c"
+#line 5333 "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 5456 "ui.c"
+#line 5340 "ui.c"
 }
 
 
@@ -5470,68 +5354,68 @@ static void user_interface_page_move_right_menuitem_activate_cb (UserInterface*
 	Book* _tmp8_ = NULL;
 	guint _tmp9_ = 0U;
 	guint _tmp10_ = 0U;
-#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->_book;
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_page_index (_tmp4_, _tmp5_);
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = _tmp6_;
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = index;
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->_book;
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = book_get_n_pages (_tmp8_);
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = _tmp9_;
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ < (_tmp10_ - 1)) {
-#line 5506 "ui.c"
+#line 5390 "ui.c"
 		Book* _tmp11_ = NULL;
 		Page* _tmp12_ = NULL;
 		Book* _tmp13_ = NULL;
 		Page* _tmp14_ = NULL;
 		guint _tmp15_ = 0U;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = self->priv->_book;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = page;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = self->priv->_book;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = page;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = book_get_page_index (_tmp13_, _tmp14_);
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_move_page (_tmp11_, _tmp12_, _tmp15_ + 1);
-#line 5524 "ui.c"
+#line 5408 "ui.c"
 	}
-#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5528 "ui.c"
+#line 5412 "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 5535 "ui.c"
+#line 5419 "ui.c"
 }
 
 
@@ -5542,207 +5426,207 @@ static void user_interface_page_delete_menuitem_activate_cb (UserInterface* self
 	BookView* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_book (_tmp0_);
-#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book_view;
-#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book_view_get_selected_page (_tmp3_);
-#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_delete_page (_tmp2_, _tmp5_);
-#line 5564 "ui.c"
+#line 5448 "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 5571 "ui.c"
+#line 5455 "ui.c"
 }
 
 
-static Block1Data* block1_data_ref (Block1Data* _data1_) {
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_atomic_int_inc (&_data1_->_ref_count_);
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return _data1_;
-#line 5580 "ui.c"
+static Block2Data* block2_data_ref (Block2Data* _data2_) {
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_atomic_int_inc (&_data2_->_ref_count_);
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return _data2_;
+#line 5464 "ui.c"
 }
 
 
-static void block1_data_unref (void * _userdata_) {
-	Block1Data* _data1_;
-	_data1_ = (Block1Data*) _userdata_;
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
-#line 5589 "ui.c"
+static void block2_data_unref (void * _userdata_) {
+	Block2Data* _data2_;
+	_data2_ = (Block2Data*) _userdata_;
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) {
+#line 5473 "ui.c"
 		UserInterface* self;
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self = _data1_->self;
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_data1_->dialog);
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		self = _data2_->self;
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_data2_->dialog);
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (self);
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_slice_free (Block1Data, _data1_);
-#line 5599 "ui.c"
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_slice_free (Block2Data, _data2_);
+#line 5483 "ui.c"
 	}
 }
 
 
-static gboolean __lambda5_ (Block1Data* _data1_, GdkEventKey* e) {
+static gboolean __lambda6_ (Block2Data* _data2_, GdkEventKey* e) {
 	UserInterface* self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	GdkEventKey* _tmp1_ = NULL;
 	GdkModifierType _tmp2_ = 0;
-#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = _data1_->self;
-#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = _data2_->self;
+#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (e != NULL, FALSE);
-#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = e;
-#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_->state;
-#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_ == 0) {
-#line 5620 "ui.c"
+#line 5504 "ui.c"
 		GdkEventKey* _tmp3_ = NULL;
 		guint _tmp4_ = 0U;
-#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = e;
-#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = _tmp3_->keyval;
-#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_ == ((guint) GDK_KEY_Escape);
-#line 5629 "ui.c"
+#line 5513 "ui.c"
 	} else {
-#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = FALSE;
-#line 5633 "ui.c"
+#line 5517 "ui.c"
 	}
-#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
-#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
+#line 1183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
-#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 5643 "ui.c"
+#line 5527 "ui.c"
 	}
-#line 1190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5649 "ui.c"
+#line 5533 "ui.c"
 }
 
 
-static gboolean ___lambda5__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
+static gboolean ___lambda6__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
-	result = __lambda5_ (self, event);
-#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = __lambda6_ (self, event);
+#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5658 "ui.c"
+#line 5542 "ui.c"
 }
 
 
-static void __lambda6_ (Block1Data* _data1_) {
+static void __lambda7_ (Block2Data* _data2_) {
 	UserInterface* self;
 	Book* _tmp0_ = NULL;
-#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = _data1_->self;
-#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = _data2_->self;
+#line 1202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_combine_sides (_tmp0_);
-#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
-#line 5673 "ui.c"
+#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
+#line 5557 "ui.c"
 }
 
 
-static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda6_ (self);
-#line 5680 "ui.c"
+static void ___lambda7__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda7_ (self);
+#line 5564 "ui.c"
 }
 
 
-static void __lambda7_ (Block1Data* _data1_) {
+static void __lambda8_ (Block2Data* _data2_) {
 	UserInterface* self;
 	Book* _tmp0_ = NULL;
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = _data1_->self;
-#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = _data2_->self;
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_combine_sides_reverse (_tmp0_);
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
-#line 5695 "ui.c"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
+#line 5579 "ui.c"
 }
 
 
-static void ___lambda7__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda7_ (self);
-#line 5702 "ui.c"
+static void ___lambda8__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda8_ (self);
+#line 5586 "ui.c"
 }
 
 
-static void __lambda8_ (Block1Data* _data1_) {
+static void __lambda9_ (Block2Data* _data2_) {
 	UserInterface* self;
 	Book* _tmp0_ = NULL;
-#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = _data1_->self;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = _data2_->self;
+#line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_reverse (_tmp0_);
-#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
-#line 5717 "ui.c"
+#line 1223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
+#line 5601 "ui.c"
 }
 
 
-static void ___lambda8__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda8_ (self);
-#line 5724 "ui.c"
+static void ___lambda9__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda9_ (self);
+#line 5608 "ui.c"
 }
 
 
-static void __lambda9_ (Block1Data* _data1_) {
+static void __lambda10_ (Block2Data* _data2_) {
 	UserInterface* self;
-#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = _data1_->self;
-#line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
-#line 5734 "ui.c"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = _data2_->self;
+#line 1232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _data2_->dialog);
+#line 5618 "ui.c"
 }
 
 
-static void ___lambda9__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda9_ (self);
-#line 5741 "ui.c"
+static void ___lambda10__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda10_ (self);
+#line 5625 "ui.c"
 }
 
 
 static void user_interface_reorder_document (UserInterface* self) {
-	Block1Data* _data1_;
+	Block2Data* _data2_;
 	GtkWindow* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	GtkGrid* g = NULL;
@@ -5768,170 +5652,170 @@ static void user_interface_reorder_document (UserInterface* self) {
 	GtkButton* _tmp20_ = NULL;
 	GtkButton* _tmp21_ = NULL;
 	GtkButton* _tmp22_ = NULL;
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data1_ = g_slice_new0 (Block1Data);
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data1_->_ref_count_ = 1;
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data1_->self = g_object_ref (self);
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data2_ = g_slice_new0 (Block2Data);
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data2_->_ref_count_ = 1;
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data2_->self = g_object_ref (self);
+#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkWindow*) gtk_window_new (GTK_WINDOW_TOPLEVEL);
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data1_->dialog = _tmp0_;
+#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data2_->dialog = _tmp0_;
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_type_hint (_data2_->dialog, GDK_WINDOW_TYPE_HINT_DIALOG);
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_modal (_data2_->dialog, TRUE);
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_container_set_border_width ((GtkContainer*) _data2_->dialog, (guint) 12);
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = _ ("Reorder Pages");
 #line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_type_hint (_data1_->dialog, GDK_WINDOW_TYPE_HINT_DIALOG);
+	gtk_window_set_title (_data2_->dialog, _tmp1_);
 #line 1177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_modal (_data1_->dialog, TRUE);
+	gtk_window_set_transient_for (_data2_->dialog, (GtkWindow*) self);
 #line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_set_border_width ((GtkContainer*) _data1_->dialog, (guint) 12);
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = _ ("Reorder Pages");
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_title (_data1_->dialog, _tmp1_);
-#line 1181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_transient_for (_data1_->dialog, (GtkWindow*) self);
-#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_data ((GtkWidget*) _data1_->dialog, "key-press-event", (GCallback) ___lambda5__gtk_widget_key_press_event, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 1192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _data1_->dialog, TRUE);
-#line 1194 "/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 1188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _data2_->dialog, TRUE);
+#line 1190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = (GtkGrid*) gtk_grid_new ();
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp2_);
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g = _tmp2_;
-#line 1195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_set_row_homogeneous (g, TRUE);
-#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_set_row_spacing (g, 6);
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_set_column_homogeneous (g, TRUE);
-#line 1198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_set_column_spacing (g, 6);
-#line 1199 "/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*) g, TRUE);
-#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_add ((GtkContainer*) _data1_->dialog, (GtkWidget*) g);
-#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_container_add ((GtkContainer*) _data2_->dialog, (GtkWidget*) g);
+#line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _ ("Combine sides");
-#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = user_interface_make_reorder_button (self, _tmp3_, "F1F2F3B1B2B3-F1B1F2B2F3B3");
-#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp4_;
-#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = b;
-#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_data (_tmp5_, "clicked", (GCallback) ___lambda6__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1200 "/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 1205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = b;
-#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp6_, TRUE);
-#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = b;
-#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp7_, 0, 0, 1, 1);
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("Combine sides (reverse)");
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = user_interface_make_reorder_button (self, _tmp8_, "F1F2F3B3B2B1-F1B1F2B2F3B3");
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp9_;
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = b;
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_data (_tmp10_, "clicked", (GCallback) ___lambda7__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1210 "/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 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = b;
-#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
-#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = b;
-#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp12_, 1, 0, 1, 1);
-#line 1223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = _ ("Reverse");
-#line 1223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = user_interface_make_reorder_button (self, _tmp13_, "C1C2C3C4C5C6-C6C5C4C3C2C1");
-#line 1223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp14_;
-#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = b;
-#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_data (_tmp15_, "clicked", (GCallback) ___lambda8__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1220 "/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 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = b;
-#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp16_, TRUE);
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = b;
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp17_, 0, 2, 1, 1);
-#line 1233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = _ ("Keep unchanged");
-#line 1233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = user_interface_make_reorder_button (self, _tmp18_, "C1C2C3C4C5C6-C1C2C3C4C5C6");
-#line 1233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp19_;
-#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = b;
+#line 1230 "/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 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_data (_tmp20_, "clicked", (GCallback) ___lambda9__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 1238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = b;
-#line 1238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp21_, TRUE);
-#line 1239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = b;
-#line 1239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp22_, 1, 2, 1, 1);
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_present (_data1_->dialog);
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_present (_data2_->dialog);
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (g);
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	block1_data_unref (_data1_);
-#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_data1_ = NULL;
-#line 5908 "ui.c"
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	block2_data_unref (_data2_);
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data2_ = NULL;
+#line 5792 "ui.c"
 }
 
 
 void user_interface_reorder_document_activate_cb (UserInterface* self) {
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_document (self);
-#line 5917 "ui.c"
+#line 5801 "ui.c"
 }
 
 
 static void user_interface_reorder_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_document (self);
-#line 5928 "ui.c"
+#line 5812 "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 5935 "ui.c"
+#line 5819 "ui.c"
 }
 
 
@@ -5947,61 +5831,61 @@ static GtkButton* user_interface_make_reorder_button (UserInterface* self, const
 	GtkBox* rb = NULL;
 	const gchar* _tmp4_ = NULL;
 	GtkBox* _tmp5_ = NULL;
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (text != NULL, NULL);
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (items != NULL, NULL);
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkButton*) gtk_button_new ();
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp0_;
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	vbox = _tmp1_;
-#line 1260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) vbox, TRUE);
-#line 1261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) b, (GtkWidget*) vbox);
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = text;
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = (GtkLabel*) gtk_label_new (_tmp2_);
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	label = _tmp3_;
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) label, TRUE);
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) label, TRUE, TRUE, (guint) 0);
-#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = items;
-#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = user_interface_make_reorder_box (self, _tmp4_);
-#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	rb = _tmp5_;
-#line 1268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) rb, TRUE);
-#line 1269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) rb, TRUE, TRUE, (guint) 0);
-#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = b;
-#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (rb);
-#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (label);
-#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (vbox);
-#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 6005 "ui.c"
+#line 5889 "ui.c"
 }
 
 
@@ -6019,7 +5903,7 @@ static gchar string_get (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 997 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	return result;
-#line 6023 "ui.c"
+#line 5907 "ui.c"
 }
 
 
@@ -6029,35 +5913,35 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 	GtkBox* _tmp0_ = NULL;
 	GtkBox* _tmp1_ = NULL;
 	GtkBox* page_box = NULL;
-#line 1274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (items != NULL, NULL);
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	box = _tmp0_;
-#line 1277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = box;
-#line 1277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp1_, TRUE);
-#line 1279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_box = NULL;
-#line 6049 "ui.c"
+#line 5933 "ui.c"
 	{
 		gint i = 0;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		i = 0;
-#line 6054 "ui.c"
+#line 5938 "ui.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp2_ = TRUE;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 6061 "ui.c"
+#line 5945 "ui.c"
 				const gchar* _tmp4_ = NULL;
 				gint _tmp5_ = 0;
 				gchar _tmp6_ = '\0';
@@ -6097,164 +5981,164 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 				PageIcon* _tmp49_ = NULL;
 				GtkBox* _tmp50_ = NULL;
 				PageIcon* _tmp51_ = NULL;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp2_) {
-#line 6103 "ui.c"
+#line 5987 "ui.c"
 					gint _tmp3_ = 0;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp3_ = i;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					i = _tmp3_ + 1;
-#line 6109 "ui.c"
+#line 5993 "ui.c"
 				}
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp2_ = FALSE;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp4_ = items;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp5_ = i;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp6_ = string_get (_tmp4_, (glong) _tmp5_);
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!(_tmp6_ != '\0')) {
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 6123 "ui.c"
+#line 6007 "ui.c"
 				}
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = items;
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = i;
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = string_get (_tmp7_, (glong) _tmp8_);
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp9_ == '-') {
-#line 6133 "ui.c"
+#line 6017 "ui.c"
 					GtkArrow* a = NULL;
 					GtkArrow* _tmp10_ = NULL;
 					GtkArrow* _tmp11_ = NULL;
 					GtkBox* _tmp12_ = NULL;
 					GtkArrow* _tmp13_ = NULL;
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp10_ = (GtkArrow*) gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					g_object_ref_sink (_tmp10_);
-#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					a = _tmp10_;
-#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp11_ = a;
-#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
-#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp12_ = box;
-#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp13_ = a;
-#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_box_pack_start (_tmp12_, (GtkWidget*) _tmp13_, FALSE, FALSE, (guint) 0);
-#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (page_box);
-#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					page_box = NULL;
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (a);
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					continue;
-#line 6163 "ui.c"
+#line 6047 "ui.c"
 				}
-#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp14_ = items;
-#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp15_ = i;
-#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp16_ = string_get (_tmp14_, (glong) _tmp15_);
-#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				side = _tmp16_;
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp17_ = i;
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				i = _tmp17_ + 1;
-#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp18_ = items;
-#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp19_ = i;
-#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp20_ = string_get (_tmp18_, (glong) _tmp19_);
-#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp20_ == '\0') {
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 6187 "ui.c"
+#line 6071 "ui.c"
 				}
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = page_box;
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp21_ == NULL) {
-#line 6193 "ui.c"
+#line 6077 "ui.c"
 					GtkBox* _tmp22_ = NULL;
 					GtkBox* _tmp23_ = NULL;
 					GtkBox* _tmp24_ = NULL;
 					GtkBox* _tmp25_ = NULL;
-#line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					g_object_ref_sink (_tmp22_);
-#line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (page_box);
-#line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					page_box = _tmp22_;
-#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp23_ = page_box;
-#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_widget_set_visible ((GtkWidget*) _tmp23_, TRUE);
-#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp24_ = box;
-#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp25_ = page_box;
-#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_box_pack_start (_tmp24_, (GtkWidget*) _tmp25_, FALSE, FALSE, (guint) 0);
-#line 6216 "ui.c"
+#line 6100 "ui.c"
 				}
-#line 1305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				r = 1.0;
-#line 1306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				g = 1.0;
-#line 1307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				b = 1.0;
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp26_ = side;
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				switch (_tmp26_) {
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'F':
-#line 6230 "ui.c"
+#line 6114 "ui.c"
 					{
-#line 1312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						r = 0x75 / 255.0;
-#line 1313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						g = 0x50 / 255.0;
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						b = 0x7B / 255.0;
-#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 6240 "ui.c"
+#line 6124 "ui.c"
 					}
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'B':
-#line 6244 "ui.c"
+#line 6128 "ui.c"
 					{
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1314 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						r = 0xF5 / 255.0;
-#line 1319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						g = 0x79 / 255.0;
-#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1316 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						b = 0.0;
-#line 1321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 6254 "ui.c"
+#line 6138 "ui.c"
 					}
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'C':
-#line 6258 "ui.c"
+#line 6142 "ui.c"
 					{
 						gdouble p = 0.0;
 						const gchar* _tmp27_ = NULL;
@@ -6263,129 +6147,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 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp27_ = items;
-#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp28_ = i;
-#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp29_ = string_get (_tmp27_, (glong) _tmp28_);
-#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						p = (_tmp29_ - '1') / 5.0;
-#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp30_ = p;
-#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp31_ = p;
-#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						r = ((0xED / 255.0) * (1 - _tmp30_)) + (0xCC * _tmp31_);
-#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp32_ = p;
-#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						g = (0xD4 / 255.0) * (1 - _tmp32_);
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						b = (gdouble) 0;
-#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 6289 "ui.c"
+#line 6173 "ui.c"
 					}
 					default:
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1304 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
-#line 6294 "ui.c"
+#line 6178 "ui.c"
 				}
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp33_ = r;
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp34_ = r;
-#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				r = _tmp33_ + ((1.0 - _tmp34_) * 0.7);
-#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp35_ = g;
-#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp36_ = g;
-#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				g = _tmp35_ + ((1.0 - _tmp36_) * 0.7);
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp37_ = b;
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp38_ = b;
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				b = _tmp37_ + ((1.0 - _tmp38_) * 0.7);
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp39_ = items;
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp40_ = i;
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp41_ = string_get (_tmp39_, (glong) _tmp40_);
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp42_ = g_strdup_printf ("%c", (gint) _tmp41_);
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp43_ = _tmp42_;
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp44_ = r;
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp45_ = g;
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp46_ = b;
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp47_ = page_icon_new (_tmp43_, _tmp44_, _tmp45_, _tmp46_);
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				g_object_ref_sink (_tmp47_);
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp48_ = _tmp47_;
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (_tmp43_);
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				icon = _tmp48_;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp49_ = icon;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_widget_set_visible ((GtkWidget*) _tmp49_, TRUE);
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp50_ = page_box;
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp51_ = icon;
-#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_box_pack_start (_tmp50_, (GtkWidget*) _tmp51_, FALSE, FALSE, (guint) 0);
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (icon);
-#line 6352 "ui.c"
+#line 6236 "ui.c"
 			}
 		}
 	}
-#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = box;
-#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (page_box);
-#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 6362 "ui.c"
+#line 6246 "ui.c"
 }
 
 
 static void user_interface_save_file_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, FALSE);
-#line 6373 "ui.c"
+#line 6257 "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 6380 "ui.c"
+#line 6264 "ui.c"
 }
 
 
 void user_interface_save_document_activate_cb (UserInterface* self) {
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, FALSE);
-#line 6389 "ui.c"
+#line 6273 "ui.c"
 }
 
 
@@ -6396,76 +6280,76 @@ static void user_interface_copy_to_clipboard_button_clicked_cb (UserInterface* s
 	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ != NULL) {
-#line 6418 "ui.c"
+#line 6302 "ui.c"
 		Page* _tmp5_ = NULL;
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = page;
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_copy_to_clipboard (_tmp5_, (GtkWindow*) self);
-#line 6424 "ui.c"
+#line 6308 "ui.c"
 	}
-#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 6428 "ui.c"
+#line 6312 "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 6435 "ui.c"
+#line 6319 "ui.c"
 }
 
 
 static void user_interface_save_as_file_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 1364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, TRUE);
-#line 6446 "ui.c"
+#line 6330 "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 6453 "ui.c"
+#line 6337 "ui.c"
 }
 
 
 void user_interface_save_as_document_activate_cb (UserInterface* self) {
-#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, TRUE);
-#line 6462 "ui.c"
+#line 6346 "ui.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 6469 "ui.c"
+#line 6353 "ui.c"
 }
 
 
@@ -6503,118 +6387,118 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op
 	GdkPixbuf* _tmp30_ = NULL;
 	cairo_t* _tmp31_ = NULL;
 	cairo_t* _tmp32_ = NULL;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (operation != NULL);
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (print_context != NULL);
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = print_context;
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_print_context_get_cairo_context (_tmp0_);
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _cairo_reference0 (_tmp1_);
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	context = _tmp2_;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->_book;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_number;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_get_page (_tmp3_, _tmp4_);
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp5_;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	is_landscape = FALSE;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = print_context;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = gtk_print_context_get_width (_tmp6_);
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = print_context;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = gtk_print_context_get_height (_tmp8_);
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ > _tmp9_) {
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		is_landscape = TRUE;
-#line 6543 "ui.c"
+#line 6427 "ui.c"
 	}
-#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = page;
-#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = page_get_is_landscape (_tmp10_);
-#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = _tmp11_;
-#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = is_landscape;
-#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp12_ != _tmp13_) {
-#line 6555 "ui.c"
+#line 6439 "ui.c"
 		cairo_t* _tmp14_ = NULL;
 		GtkPrintContext* _tmp15_ = NULL;
 		gdouble _tmp16_ = 0.0;
 		cairo_t* _tmp17_ = NULL;
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = context;
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = print_context;
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = gtk_print_context_get_width (_tmp15_);
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		cairo_translate (_tmp14_, _tmp16_, (gdouble) 0);
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = context;
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		cairo_rotate (_tmp17_, G_PI_2);
-#line 6572 "ui.c"
+#line 6456 "ui.c"
 	}
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = context;
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = print_context;
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = gtk_print_context_get_dpi_x (_tmp19_);
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = page;
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = page_get_dpi (_tmp21_);
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = _tmp22_;
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = print_context;
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = gtk_print_context_get_dpi_y (_tmp24_);
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = page;
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = page_get_dpi (_tmp26_);
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = _tmp27_;
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_scale (_tmp18_, _tmp20_ / _tmp23_, _tmp25_ / _tmp28_);
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = page;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = page_get_image (_tmp29_, TRUE);
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	image = _tmp30_;
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = context;
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gdk_cairo_set_source_pixbuf (_tmp31_, image, (gdouble) 0, (gdouble) 0);
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = context;
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_paint (_tmp32_);
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (image);
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_cairo_destroy0 (context);
-#line 6618 "ui.c"
+#line 6502 "ui.c"
 }
 
 
@@ -6622,26 +6506,26 @@ static void user_interface_email_button_clicked_cb (UserInterface* self, GtkWidg
 	const gchar* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->document_hint;
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
-#line 6638 "ui.c"
+#line 6522 "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 6645 "ui.c"
+#line 6529 "ui.c"
 }
 
 
@@ -6649,24 +6533,24 @@ void user_interface_email_document_activate_cb (UserInterface* self) {
 	const gchar* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->document_hint;
-#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
-#line 6663 "ui.c"
+#line 6547 "ui.c"
 }
 
 
 static void _user_interface_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self) {
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_draw_page ((UserInterface*) self, _sender, context, page_nr);
-#line 6670 "ui.c"
+#line 6554 "ui.c"
 }
 
 
@@ -6678,186 +6562,186 @@ static void user_interface_print_document (UserInterface* self) {
 	guint _tmp3_ = 0U;
 	guint _tmp6_ = 0U;
 	GError * _inner_error_ = NULL;
-#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_print_operation_new ();
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	print = _tmp0_;
-#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_set (print, "n-pages", (gint) _tmp3_, NULL);
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1410 "/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 6698 "ui.c"
+#line 6582 "ui.c"
 	{
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1414 "/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 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6704 "ui.c"
-			goto __catch19_g_error;
+#line 6588 "ui.c"
+			goto __catch20_g_error;
 		}
 	}
-	goto __finally19;
-	__catch19_g_error:
+	goto __finally20;
+	__catch20_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = e;
-#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp4_->message;
-#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1422: Error printing: %s", _tmp5_);
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:1418: Error printing: %s", _tmp5_);
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 6726 "ui.c"
+#line 6610 "ui.c"
 	}
-	__finally19:
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally20:
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (print);
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1412 "/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 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 6739 "ui.c"
+#line 6623 "ui.c"
 	}
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("draw-page", gtk_print_operation_get_type (), &_tmp6_, NULL, FALSE);
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1421 "/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 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (print);
-#line 6747 "ui.c"
+#line 6631 "ui.c"
 }
 
 
 static void user_interface_print_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 1429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1431 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document (self);
-#line 6758 "ui.c"
+#line 6642 "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 6765 "ui.c"
+#line 6649 "ui.c"
 }
 
 
 void user_interface_print_document_activate_cb (UserInterface* self) {
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document (self);
-#line 6774 "ui.c"
+#line 6658 "ui.c"
 }
 
 
 static void user_interface_launch_help (UserInterface* self) {
 	GError * _inner_error_ = NULL;
-#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 6782 "ui.c"
+#line 6666 "ui.c"
 	{
 		GdkScreen* _tmp0_ = NULL;
 		GdkScreen* _tmp1_ = NULL;
 		guint32 _tmp2_ = 0U;
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = gtk_window_get_screen ((GtkWindow*) self);
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = _tmp0_;
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_get_current_event_time ();
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_show_uri (_tmp1_, "help:simple-scan", _tmp2_, &_inner_error_);
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6797 "ui.c"
-			goto __catch20_g_error;
+#line 6681 "ui.c"
+			goto __catch21_g_error;
 		}
 	}
-	goto __finally20;
-	__catch20_g_error:
+	goto __finally21;
+	__catch21_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp3_ = NULL;
 		GError* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _ ("Unable to open help file");
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = e;
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp4_->message;
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp3_, _tmp5_);
-#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 6822 "ui.c"
+#line 6706 "ui.c"
 	}
-	__finally20:
-#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally21:
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1437 "/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 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 6833 "ui.c"
+#line 6717 "ui.c"
 	}
 }
 
 
 static void user_interface_help_contents_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_launch_help (self);
-#line 6845 "ui.c"
+#line 6729 "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 6852 "ui.c"
+#line 6736 "ui.c"
 }
 
 
 void user_interface_help_contents_activate_cb (UserInterface* self) {
-#line 1459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_launch_help (self);
-#line 6861 "ui.c"
+#line 6745 "ui.c"
 }
 
 
@@ -6877,21 +6761,21 @@ static void user_interface_show_about (UserInterface* self) {
 	const gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
 	const gchar* _tmp8_ = NULL;
-#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("Robert Ancell <robert.ancell@canonical.com>");
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_new0 (gchar*, 1 + 1);
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_[0] = _tmp0_;
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors = _tmp1_;
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors_length1 = 1;
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_authors_size_ = authors_length1;
-#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1465 "/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" \
@@ -6904,62 +6788,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 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	license = _tmp3_;
-#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _ ("About Simple Scan");
-#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	title = _tmp5_;
-#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _ ("Simple document scanning tool");
-#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	description = _tmp7_;
-#line 1477 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("translator-credits");
-#line 1477 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1473 "/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-2011 Canonical Ltd.", "license", license, "wrap-license", TRUE, NULL, NULL);
-#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (description);
-#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (title);
-#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (license);
-#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors = (_vala_array_free (authors, authors_length1, (GDestroyNotify) g_free), NULL);
-#line 6925 "ui.c"
+#line 6809 "ui.c"
 }
 
 
 static void user_interface_about_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_about (self);
-#line 6936 "ui.c"
+#line 6820 "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 6943 "ui.c"
+#line 6827 "ui.c"
 }
 
 
 void user_interface_about_activate_cb (UserInterface* self) {
-#line 1498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_about (self);
-#line 6952 "ui.c"
+#line 6836 "ui.c"
 }
 
 
@@ -6970,110 +6854,110 @@ static gboolean user_interface_on_quit (UserInterface* self) {
 	gboolean _tmp2_ = FALSE;
 	guint _tmp3_ = 0U;
 	AutosaveManager* _tmp4_ = NULL;
-#line 1503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Save document before quitting?");
-#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Quit without Saving");
-#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_prompt_to_save (self, _tmp0_, _tmp1_);
-#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 1509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 1509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 6977 "ui.c"
+#line 6861 "ui.c"
 	}
-#line 1511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) self);
-#line 1513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->save_state_timeout;
-#line 1513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_ != ((guint) 0)) {
-#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, TRUE);
-#line 6987 "ui.c"
+#line 6871 "ui.c"
 	}
-#line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->autosave_manager;
-#line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	autosave_manager_cleanup (_tmp4_);
-#line 1518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 1518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 6997 "ui.c"
+#line 6881 "ui.c"
 }
 
 
 static void user_interface_quit_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_quit (self);
-#line 7008 "ui.c"
+#line 6892 "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 7015 "ui.c"
+#line 6899 "ui.c"
 }
 
 
 void user_interface_quit_activate_cb (UserInterface* self) {
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_quit (self);
-#line 7024 "ui.c"
+#line 6908 "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 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->window_is_maximized;
-#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp0_) {
-#line 7041 "ui.c"
+#line 6925 "ui.c"
 		GdkEventConfigure* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
 		GdkEventConfigure* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = event;
-#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = _tmp1_->width;
-#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_width = _tmp2_;
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = event;
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = _tmp3_->height;
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_height = _tmp4_;
-#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, FALSE);
-#line 7060 "ui.c"
+#line 6944 "ui.c"
 	}
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 7066 "ui.c"
+#line 6950 "ui.c"
 }
 
 
@@ -7082,47 +6966,1314 @@ static gboolean _user_interface_simple_scan_window_configure_event_cb_gtk_widget
 	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 7075 "ui.c"
+#line 6959 "ui.c"
 }
 
 
 static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar* widget, gint response_id) {
 	gint _tmp0_ = 0;
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = response_id;
+#line 1543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	switch (_tmp0_) {
+#line 1543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case 1:
+#line 6975 "ui.c"
+		{
+			GtkComboBox* _tmp1_ = NULL;
+			GtkDialog* _tmp2_ = NULL;
 #line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp0_ == 1) {
-#line 7089 "ui.c"
-		GtkComboBox* _tmp1_ = NULL;
-		GtkDialog* _tmp2_ = NULL;
-#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp1_ = self->priv->device_combo;
+			_tmp1_ = self->priv->device_combo;
+#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gtk_widget_grab_focus ((GtkWidget*) _tmp1_);
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp2_ = self->priv->preferences_dialog;
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gtk_window_present ((GtkWindow*) _tmp2_);
 #line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_grab_focus ((GtkWidget*) _tmp1_);
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = self->priv->preferences_dialog;
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_window_present ((GtkWindow*) _tmp2_);
-#line 7100 "ui.c"
-	} else {
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->have_error = FALSE;
-#line 1555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (self->priv->error_title);
+			break;
+#line 6989 "ui.c"
+		}
+#line 1543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case 2:
+#line 6993 "ui.c"
+		{
+#line 1552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			user_interface_install_drivers (self);
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			break;
+#line 6999 "ui.c"
+		}
+		default:
+		{
 #line 1555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->error_title = NULL;
+			self->priv->have_error = FALSE;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_free0 (self->priv->error_text);
+			_g_free0 (self->priv->error_title);
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->error_text = NULL;
+			self->priv->error_title = NULL;
 #line 1557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_update_info_bar (self);
-#line 7114 "ui.c"
+			_g_free0 (self->priv->error_text);
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			self->priv->error_text = NULL;
+#line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			user_interface_update_info_bar (self);
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			break;
+#line 7017 "ui.c"
+		}
+	}
+}
+
+
+static Block3Data* block3_data_ref (Block3Data* _data3_) {
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_atomic_int_inc (&_data3_->_ref_count_);
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return _data3_;
+#line 7028 "ui.c"
+}
+
+
+static void block3_data_unref (void * _userdata_) {
+	Block3Data* _data3_;
+	_data3_ = (Block3Data*) _userdata_;
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) {
+#line 7037 "ui.c"
+		UserInterface* self;
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		self = _data3_->self;
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_data3_->instructions_label);
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_data3_->status_label);
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_data3_->spinner);
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_data3_->stack);
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (self);
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_slice_free (Block3Data, _data3_);
+#line 7053 "ui.c"
+	}
+}
+
+
+static void ___lambda12_ (UserInterface* self) {
+}
+
+
+static void ____lambda12__pk_progress_callback (PkProgress* progress, PkProgressType type, gpointer self) {
+#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	___lambda12_ ((UserInterface*) self);
+#line 7065 "ui.c"
+}
+
+
+static void ___lambda13_ (Block3Data* _data3_, GObject* object, GAsyncResult* _result_) {
+	UserInterface* self;
+	GtkLabel* _tmp0_ = NULL;
+	GtkSpinner* _tmp1_ = NULL;
+	GtkLabel* _tmp2_ = NULL;
+	GtkStack* _tmp3_ = NULL;
+	GtkLabel* _tmp4_ = NULL;
+	gchar* result_text = NULL;
+	const gchar* _tmp5_ = NULL;
+	gchar* _tmp6_ = NULL;
+	GtkLabel* _tmp23_ = NULL;
+	GError * _inner_error_ = NULL;
+#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = _data3_->self;
+#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (_result_ != NULL);
+#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = _data3_->status_label;
+#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp0_, TRUE);
+#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = _data3_->spinner;
+#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_set (_tmp1_, "active", FALSE, NULL);
+#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _data3_->status_label;
+#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_label_set_text (_tmp2_, "☒");
+#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _data3_->stack;
+#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = _data3_->status_label;
+#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_stack_set_visible_child (_tmp3_, (GtkWidget*) _tmp4_);
+#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = _ ("Drivers installed successfully!");
+#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = g_strdup (_tmp5_);
+#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result_text = _tmp6_;
+#line 7109 "ui.c"
+	{
+		PkResults* results = NULL;
+		GAsyncResult* _tmp7_ = NULL;
+		PkResults* _tmp8_ = NULL;
+		PkError* _tmp9_ = NULL;
+		PkError* _tmp10_ = NULL;
+		gboolean _tmp11_ = FALSE;
+#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp7_ = _result_;
+#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp8_ = user_interface_install_packages_finish (self, _tmp7_, &_inner_error_);
+#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		results = _tmp8_;
+#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 7125 "ui.c"
+			goto __catch22_g_error;
+		}
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp9_ = pk_results_get_error_code (results);
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp10_ = _tmp9_;
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp11_ = _tmp10_ == NULL;
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_tmp10_);
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_tmp11_) {
+#line 7138 "ui.c"
+			GtkLabel* _tmp12_ = NULL;
+#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp12_ = _data3_->status_label;
+#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gtk_label_set_text (_tmp12_, "☑");
+#line 7144 "ui.c"
+		} else {
+			PkError* e = NULL;
+			PkError* _tmp13_ = NULL;
+			gchar* error_text = NULL;
+			const gchar* _tmp14_ = NULL;
+			PkError* _tmp15_ = NULL;
+			PkErrorEnum _tmp16_ = 0;
+			PkErrorEnum _tmp17_ = 0;
+			gchar* _tmp18_ = NULL;
+#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp13_ = pk_results_get_error_code (results);
+#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			e = _tmp13_;
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp14_ = _ ("Failed to install drivers (error code %d).");
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp15_ = e;
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_object_get (_tmp15_, "code", &_tmp16_, NULL);
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp17_ = _tmp16_;
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp18_ = g_strdup_printf (_tmp14_, _tmp17_);
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			error_text = _tmp18_;
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_g_free0 (error_text);
+#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_g_object_unref0 (e);
+#line 7174 "ui.c"
+		}
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (results);
+#line 7178 "ui.c"
+	}
+	goto __finally22;
+	__catch22_g_error:
+	{
+		GError* e = NULL;
+		const gchar* _tmp19_ = NULL;
+		gchar* _tmp20_ = NULL;
+		GError* _tmp21_ = NULL;
+		const gchar* _tmp22_ = NULL;
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		e = _inner_error_;
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_inner_error_ = NULL;
+#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp19_ = _ ("Failed to install drivers.");
+#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp20_ = g_strdup (_tmp19_);
+#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (self->priv->error_text);
+#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		self->priv->error_text = _tmp20_;
+#line 1665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp21_ = e;
+#line 1665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp22_ = _tmp21_->message;
+#line 1665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:1665: Failed to install drivers: %s", _tmp22_);
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_error_free0 (e);
+#line 7208 "ui.c"
+	}
+	__finally22:
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (result_text);
+#line 1648 "/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 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_clear_error (&_inner_error_);
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return;
+#line 7221 "ui.c"
+	}
+#line 1667 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp23_ = _data3_->instructions_label;
+#line 1667 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_label_set_text (_tmp23_, result_text);
+#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (result_text);
+#line 7229 "ui.c"
+}
+
+
+static void ____lambda13__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) {
+#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	___lambda13_ (self, source_object, res);
+#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	block3_data_unref (self);
+#line 7238 "ui.c"
+}
+
+
+static void user_interface_install_drivers (UserInterface* self) {
+	Block3Data* _data3_;
+	gchar* message = NULL;
+	gchar* _tmp0_ = NULL;
+	gchar* instructions = NULL;
+	gchar* _tmp1_ = NULL;
+	gchar** packages_to_install = NULL;
+	gchar** _tmp2_ = NULL;
+	gint packages_to_install_length1 = 0;
+	gint _packages_to_install_size_ = 0;
+	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
+	GQuark _tmp6_ = 0U;
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	static GQuark _tmp5_label0 = 0;
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	static GQuark _tmp5_label1 = 0;
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	static GQuark _tmp5_label2 = 0;
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	static GQuark _tmp5_label3 = 0;
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	static GQuark _tmp5_label4 = 0;
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	static GQuark _tmp5_label5 = 0;
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	static GQuark _tmp5_label6 = 0;
+#line 7269 "ui.c"
+	GtkDialog* dialog = NULL;
+	const gchar* _tmp23_ = NULL;
+	const gchar* _tmp24_ = NULL;
+	GtkDialog* _tmp25_ = NULL;
+	GtkDialog* _tmp26_ = NULL;
+	GtkBox* _tmp27_ = NULL;
+	GtkDialog* _tmp28_ = NULL;
+	GtkBox* _tmp29_ = NULL;
+	GtkLabel* label = NULL;
+	const gchar* _tmp30_ = NULL;
+	GtkLabel* _tmp31_ = NULL;
+	GtkLabel* _tmp32_ = NULL;
+	GtkLabel* _tmp33_ = NULL;
+	GtkDialog* _tmp34_ = NULL;
+	GtkBox* _tmp35_ = NULL;
+	GtkLabel* _tmp36_ = NULL;
+	GtkBox* instructions_box = NULL;
+	GtkBox* _tmp37_ = NULL;
+	GtkBox* _tmp38_ = NULL;
+	GtkDialog* _tmp39_ = NULL;
+	GtkBox* _tmp40_ = NULL;
+	GtkBox* _tmp41_ = NULL;
+	GtkStack* _tmp42_ = NULL;
+	GtkBox* _tmp43_ = NULL;
+	GtkStack* _tmp44_ = NULL;
+	GtkSpinner* _tmp45_ = NULL;
+	GtkSpinner* _tmp46_ = NULL;
+	GtkStack* _tmp47_ = NULL;
+	GtkSpinner* _tmp48_ = NULL;
+	GtkLabel* _tmp49_ = NULL;
+	GtkLabel* _tmp50_ = NULL;
+	GtkStack* _tmp51_ = NULL;
+	GtkLabel* _tmp52_ = NULL;
+	const gchar* _tmp53_ = NULL;
+	GtkLabel* _tmp54_ = NULL;
+	GtkLabel* _tmp55_ = NULL;
+	GtkLabel* _tmp56_ = NULL;
+	GtkLabel* _tmp57_ = NULL;
+	GtkBox* _tmp58_ = NULL;
+	GtkLabel* _tmp59_ = NULL;
+	const gchar* _tmp60_ = NULL;
+	GtkLabel* _tmp61_ = NULL;
+	GtkLabel* _tmp62_ = NULL;
+	GtkLabel* _tmp63_ = NULL;
+	GtkDialog* _tmp64_ = NULL;
+	GtkBox* _tmp65_ = NULL;
+	GtkDialog* _tmp66_ = NULL;
+	GtkBox* _tmp67_ = NULL;
+	GtkLabel* _tmp68_ = NULL;
+	gchar** _tmp69_ = NULL;
+	gint _tmp69__length1 = 0;
+	GtkDialog* _tmp75_ = NULL;
+	GtkDialog* _tmp76_ = NULL;
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data3_ = g_slice_new0 (Block3Data);
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data3_->_ref_count_ = 1;
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data3_->self = g_object_ref (self);
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = g_strdup ("");
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	message = _tmp0_;
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = g_strdup ("");
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	instructions = _tmp1_;
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = g_new0 (gchar*, 0 + 1);
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	packages_to_install = _tmp2_;
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	packages_to_install_length1 = 0;
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_packages_to_install_size_ = packages_to_install_length1;
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = self->priv->missing_driver;
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = _tmp3_;
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = (NULL == _tmp4_) ? 0 : g_quark_from_string (_tmp4_);
+#line 1567 "/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 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		switch (0) {
+#line 7357 "ui.c"
+			default:
+			{
+				const gchar* _tmp7_ = NULL;
+				gchar* _tmp8_ = NULL;
+				const gchar* _tmp9_ = NULL;
+				gchar* _tmp10_ = NULL;
+#line 1574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp7_ = _ ("You appear to have a Brother scanner.");
+#line 1574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp8_ = g_strdup (_tmp7_);
+#line 1574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_g_free0 (message);
+#line 1574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				message = _tmp8_;
+#line 1576 "/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 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp10_ = g_strdup (_tmp9_);
+#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_g_free0 (instructions);
+#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				instructions = _tmp10_;
+#line 1577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				break;
+#line 7382 "ui.c"
+			}
+		}
+	} else if (_tmp6_ == ((0 != _tmp5_label4) ? _tmp5_label4 : (_tmp5_label4 = g_quark_from_static_string ("samsung")))) {
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		switch (0) {
+#line 7388 "ui.c"
+			default:
+			{
+				const gchar* _tmp11_ = NULL;
+				gchar* _tmp12_ = NULL;
+				const gchar* _tmp13_ = NULL;
+				gchar* _tmp14_ = NULL;
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp11_ = _ ("You appear to have a Samsung scanner.");
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp12_ = g_strdup (_tmp11_);
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_g_free0 (message);
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				message = _tmp12_;
+#line 1582 "/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 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp14_ = g_strdup (_tmp13_);
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_g_free0 (instructions);
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				instructions = _tmp14_;
+#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				break;
+#line 7413 "ui.c"
+			}
+		}
+	} else if (_tmp6_ == ((0 != _tmp5_label5) ? _tmp5_label5 : (_tmp5_label5 = g_quark_from_static_string ("hpaio")))) {
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		switch (0) {
+#line 7419 "ui.c"
+			default:
+			{
+				const gchar* _tmp15_ = NULL;
+				gchar* _tmp16_ = NULL;
+				gchar* _tmp17_ = NULL;
+				gchar** _tmp18_ = NULL;
+#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp15_ = _ ("You appear to have an HP scanner.");
+#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp16_ = g_strdup (_tmp15_);
+#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_g_free0 (message);
+#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				message = _tmp16_;
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp17_ = g_strdup ("libsane-hpaio");
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp18_ = g_new0 (gchar*, 1 + 1);
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp18_[0] = _tmp17_;
+#line 1587 "/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 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				packages_to_install = _tmp18_;
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				packages_to_install_length1 = 1;
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_packages_to_install_size_ = packages_to_install_length1;
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				break;
+#line 7450 "ui.c"
+			}
+		}
+	} else if (_tmp6_ == ((0 != _tmp5_label6) ? _tmp5_label6 : (_tmp5_label6 = g_quark_from_static_string ("epkowa")))) {
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		switch (0) {
+#line 7456 "ui.c"
+			default:
+			{
+				const gchar* _tmp19_ = NULL;
+				gchar* _tmp20_ = NULL;
+				const gchar* _tmp21_ = NULL;
+				gchar* _tmp22_ = NULL;
+#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp19_ = _ ("You appear to have an Epson scanner.");
+#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp20_ = g_strdup (_tmp19_);
+#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_g_free0 (message);
+#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				message = _tmp20_;
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp21_ = _ ("Drivers for this are available on the <a href=\"http://support.epsom.c" \
+"om\">Epson website</a>.");
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp22_ = g_strdup (_tmp21_);
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_g_free0 (instructions);
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				instructions = _tmp22_;
+#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				break;
+#line 7481 "ui.c"
+			}
+		}
+	}
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp23_ = _ ("Install drivers");
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp24_ = _ ("_Close");
+#line 1596 "/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 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp25_);
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	dialog = _tmp25_;
+#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp26_ = dialog;
+#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp27_ = (GtkBox*) gtk_dialog_get_content_area (_tmp26_);
+#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_container_set_border_width ((GtkContainer*) _tmp27_, (guint) 12);
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp28_ = dialog;
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp29_ = (GtkBox*) gtk_dialog_get_content_area (_tmp28_);
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_set_spacing (_tmp29_, 6);
+#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp30_ = message;
+#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp31_ = (GtkLabel*) gtk_label_new (_tmp30_);
+#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp31_);
+#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	label = _tmp31_;
+#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp32_ = label;
+#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp32_, TRUE);
+#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp33_ = label;
+#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_label_set_xalign (_tmp33_, 0.f);
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp34_ = dialog;
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp35_ = (GtkBox*) gtk_dialog_get_content_area (_tmp34_);
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp36_ = label;
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_start (_tmp35_, (GtkWidget*) _tmp36_, TRUE, TRUE, (guint) 0);
+#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp37_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp37_);
+#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	instructions_box = _tmp37_;
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp38_ = instructions_box;
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp38_, TRUE);
+#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp39_ = dialog;
+#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp40_ = (GtkBox*) gtk_dialog_get_content_area (_tmp39_);
+#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp41_ = instructions_box;
+#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_start (_tmp40_, (GtkWidget*) _tmp41_, TRUE, TRUE, (guint) 0);
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp42_ = (GtkStack*) gtk_stack_new ();
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp42_);
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data3_->stack = _tmp42_;
+#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp43_ = instructions_box;
+#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp44_ = _data3_->stack;
+#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_start (_tmp43_, (GtkWidget*) _tmp44_, FALSE, FALSE, (guint) 0);
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp45_ = (GtkSpinner*) gtk_spinner_new ();
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp45_);
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data3_->spinner = _tmp45_;
+#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp46_ = _data3_->spinner;
+#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp46_, TRUE);
+#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp47_ = _data3_->stack;
+#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp48_ = _data3_->spinner;
+#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_container_add ((GtkContainer*) _tmp47_, (GtkWidget*) _tmp48_);
+#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp49_ = (GtkLabel*) gtk_label_new ("");
+#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp49_);
+#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data3_->status_label = _tmp49_;
+#line 1618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp50_ = _data3_->status_label;
+#line 1618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp50_, TRUE);
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp51_ = _data3_->stack;
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp52_ = _data3_->status_label;
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_container_add ((GtkContainer*) _tmp51_, (GtkWidget*) _tmp52_);
+#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp53_ = instructions;
+#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp54_ = (GtkLabel*) gtk_label_new (_tmp53_);
+#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp54_);
+#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data3_->instructions_label = _tmp54_;
+#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp55_ = _data3_->instructions_label;
+#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp55_, TRUE);
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp56_ = _data3_->instructions_label;
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_label_set_xalign (_tmp56_, 0.f);
+#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp57_ = _data3_->instructions_label;
+#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_label_set_use_markup (_tmp57_, TRUE);
+#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp58_ = instructions_box;
+#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp59_ = _data3_->instructions_label;
+#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_start (_tmp58_, (GtkWidget*) _tmp59_, FALSE, FALSE, (guint) 0);
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp60_ = _ ("Once installed you will need to restart Simple Scan.");
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp61_ = (GtkLabel*) gtk_label_new (_tmp60_);
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp61_);
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (label);
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	label = _tmp61_;
+#line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp62_ = label;
+#line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp62_, TRUE);
+#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp63_ = label;
+#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_label_set_xalign (_tmp63_, 0.f);
+#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp64_ = dialog;
+#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp65_ = (GtkBox*) gtk_dialog_get_content_area (_tmp64_);
+#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_container_set_border_width ((GtkContainer*) _tmp65_, (guint) 12);
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp66_ = dialog;
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp67_ = (GtkBox*) gtk_dialog_get_content_area (_tmp66_);
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp68_ = label;
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_start (_tmp67_, (GtkWidget*) _tmp68_, TRUE, TRUE, (guint) 0);
+#line 1634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp69_ = packages_to_install;
+#line 1634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp69__length1 = packages_to_install_length1;
+#line 1634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp69__length1 > 0) {
+#line 7657 "ui.c"
+		GtkStack* _tmp70_ = NULL;
+		GtkSpinner* _tmp71_ = NULL;
+		GtkLabel* _tmp72_ = NULL;
+		const gchar* _tmp73_ = NULL;
+		gchar** _tmp74_ = NULL;
+		gint _tmp74__length1 = 0;
+#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp70_ = _data3_->stack;
+#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_widget_set_visible ((GtkWidget*) _tmp70_, TRUE);
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp71_ = _data3_->spinner;
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_object_set (_tmp71_, "active", TRUE, NULL);
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp72_ = _data3_->instructions_label;
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp73_ = _ ("Installing drivers...");
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_label_set_text (_tmp72_, _tmp73_);
+#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp74_ = packages_to_install;
+#line 1640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp74__length1 = packages_to_install_length1;
+#line 1640 "/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 7684 "ui.c"
+	}
+#line 1671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp75_ = dialog;
+#line 1671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_dialog_run (_tmp75_);
+#line 1672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp76_ = dialog;
+#line 1672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _tmp76_);
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (instructions_box);
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (label);
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (dialog);
+#line 1563 "/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 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (instructions);
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (message);
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	block3_data_unref (_data3_);
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data3_ = NULL;
+#line 7710 "ui.c"
+}
+
+
+static void user_interface_install_packages_data_free (gpointer _data) {
+	UserInterfaceInstallPackagesData* _data_;
+	_data_ = _data;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (_data_->result);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (_data_->self);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_slice_free (UserInterfaceInstallPackagesData, _data_);
+#line 7723 "ui.c"
+}
+
+
+static void user_interface_install_packages (UserInterface* self, gchar** packages, int packages_length1, PkProgressCallback progress_callback, void* progress_callback_target, GAsyncReadyCallback _callback_, gpointer _user_data_) {
+	UserInterfaceInstallPackagesData* _data_;
+	UserInterface* _tmp0_ = NULL;
+	gchar** _tmp1_ = NULL;
+	gint _tmp1__length1 = 0;
+	PkProgressCallback _tmp2_ = NULL;
+	void* _tmp2__target = NULL;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_ = g_slice_new0 (UserInterfaceInstallPackagesData);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, user_interface_install_packages);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, user_interface_install_packages_data_free);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = _g_object_ref0 (self);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->self = _tmp0_;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = packages;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1__length1 = packages_length1;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->packages = _tmp1_;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->packages_length1 = _tmp1__length1;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = progress_callback;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2__target = progress_callback_target;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->progress_callback = _tmp2_;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->progress_callback_target = _tmp2__target;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_install_packages_co (_data_);
+#line 7762 "ui.c"
+}
+
+
+static PkResults* user_interface_install_packages_finish (UserInterface* self, GAsyncResult* _res_, GError** error) {
+	PkResults* result;
+	UserInterfaceInstallPackagesData* _data_;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	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 7773 "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_));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = _data_->result;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->result = NULL;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 7783 "ui.c"
+}
+
+
+static void user_interface_install_packages_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) {
+	UserInterfaceInstallPackagesData* _data_;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_ = _user_data_;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_source_object_ = source_object;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_res_ = _res_;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_install_packages_co (_data_);
+#line 7797 "ui.c"
+}
+
+
+static gint g_ptr_array_get_length (GPtrArray* self) {
+	gint result;
+	guint _tmp0_ = 0U;
+#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, 0);
+#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	_tmp0_ = self->len;
+#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	result = (gint) _tmp0_;
+#line 4428 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	return result;
+#line 7812 "ui.c"
+}
+
+
+static void g_ptr_array_set_length (GPtrArray* self, gint value) {
+	gint _tmp0_ = 0;
+#line 4429 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	g_return_if_fail (self != NULL);
+#line 4429 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	_tmp0_ = value;
+#line 4429 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
+	g_ptr_array_set_size (self, _tmp0_);
+#line 7824 "ui.c"
+}
+
+
+static gboolean user_interface_install_packages_co (UserInterfaceInstallPackagesData* _data_) {
+#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	switch (_data_->_state_) {
+#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case 0:
+#line 7833 "ui.c"
+		goto _state_0;
+#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case 1:
+#line 7837 "ui.c"
+		goto _state_1;
+#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case 2:
+#line 7841 "ui.c"
+		goto _state_2;
+		default:
+#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_assert_not_reached ();
+#line 7846 "ui.c"
+	}
+	_state_0:
+#line 1677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp0_ = NULL;
+#line 1677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp0_ = pk_task_new ();
+#line 1677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->task = _data_->_tmp0_;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp2_ = NULL;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp2_ = _data_->task;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp3_ = NULL;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp3__length1 = 0;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp3_ = _data_->packages;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp3__length1 = _data_->packages_length1;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp4_ = NULL;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp4__target = NULL;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp4_ = _data_->progress_callback;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp4__target = _data_->progress_callback_target;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_state_ = 1;
+#line 1679 "/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 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return FALSE;
+#line 7881 "ui.c"
+	_state_1:
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp5_ = NULL;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp5_ = pk_task_generic_finish (_data_->_tmp2_, _data_->_res_, &_data_->_inner_error_);
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp1_ = _data_->_tmp5_;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_error_free (_data_->_inner_error_);
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_data_->results);
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_data_->task);
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_data_->_state_ == 0) {
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_simple_async_result_complete_in_idle (_data_->_async_result);
+#line 7903 "ui.c"
+		} else {
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_simple_async_result_complete (_data_->_async_result);
+#line 7907 "ui.c"
+		}
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_object_unref (_data_->_async_result);
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return FALSE;
+#line 7913 "ui.c"
+	}
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp6_ = NULL;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp6_ = _data_->_tmp1_;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp1_ = NULL;
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (_data_->results);
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->results = _data_->_tmp6_;
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp8_ = NULL;
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp8_ = _data_->results;
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_data_->_tmp8_ == NULL) {
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_data_->_tmp7_ = TRUE;
+#line 7933 "ui.c"
+	} else {
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_data_->_tmp9_ = NULL;
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_data_->_tmp9_ = _data_->results;
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_data_->_tmp10_ = NULL;
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_data_->_tmp10_ = pk_results_get_error_code (_data_->_tmp9_);
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_data_->_tmp11_ = NULL;
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_data_->_tmp11_ = _data_->_tmp10_;
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_data_->_tmp7_ = _data_->_tmp11_ != NULL;
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_data_->_tmp11_);
+#line 7951 "ui.c"
+	}
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_data_->_tmp7_) {
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_data_->result = _data_->results;
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_data_->_tmp1_);
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_data_->task);
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_data_->_state_ == 0) {
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_simple_async_result_complete_in_idle (_data_->_async_result);
+#line 7965 "ui.c"
+		} else {
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_simple_async_result_complete (_data_->_async_result);
+#line 7969 "ui.c"
+		}
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_object_unref (_data_->_async_result);
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return FALSE;
+#line 7975 "ui.c"
+	}
+#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp12_ = NULL;
+#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp12_ = _data_->results;
+#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp13_ = NULL;
+#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp13_ = pk_results_get_package_array (_data_->_tmp12_);
+#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->package_array = _data_->_tmp13_;
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp14_ = NULL;
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp14_ = _data_->package_array;
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp15_ = 0;
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp15_ = g_ptr_array_get_length (_data_->_tmp14_);
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp16_ = 0;
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp16_ = _data_->_tmp15_;
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp17_ = NULL;
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp17_ = g_new0 (gchar*, (_data_->_tmp16_ + 1) + 1);
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->package_ids_length1 = 0;
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_package_ids_size_ = 0;
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->package_ids = _data_->_tmp17_;
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->package_ids_length1 = _data_->_tmp16_ + 1;
+#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_package_ids_size_ = _data_->package_ids_length1;
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp18_ = NULL;
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp18__length1 = 0;
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp18_ = _data_->package_ids;
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp18__length1 = _data_->package_ids_length1;
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp19_ = NULL;
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp19_ = _data_->package_array;
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp20_ = 0;
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp20_ = g_ptr_array_get_length (_data_->_tmp19_);
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp21_ = 0;
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp21_ = _data_->_tmp20_;
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (_data_->_tmp18_[_data_->_tmp21_]);
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp18_[_data_->_tmp21_] = NULL;
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp22_ = NULL;
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp22_ = _data_->_tmp18_[_data_->_tmp21_];
+#line 8041 "ui.c"
+	{
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_data_->i = 0;
+#line 8045 "ui.c"
+		{
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_data_->_tmp23_ = TRUE;
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			while (TRUE) {
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (!_data_->_tmp23_) {
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_data_->_tmp24_ = 0;
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_data_->_tmp24_ = _data_->i;
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_data_->i = _data_->_tmp24_ + 1;
+#line 8059 "ui.c"
+				}
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp23_ = FALSE;
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp25_ = 0;
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp25_ = _data_->i;
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp26_ = NULL;
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp26_ = _data_->package_array;
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp27_ = 0;
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp27_ = g_ptr_array_get_length (_data_->_tmp26_);
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp28_ = 0;
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp28_ = _data_->_tmp27_;
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (!(_data_->_tmp25_ < _data_->_tmp28_)) {
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					break;
+#line 8083 "ui.c"
+				}
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp29_ = NULL;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp29__length1 = 0;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp29_ = _data_->package_ids;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp29__length1 = _data_->package_ids_length1;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp30_ = 0;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp30_ = _data_->i;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp31_ = NULL;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp31_ = _data_->package_array;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp32_ = NULL;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp32__length1 = 0;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp32_ = _data_->_tmp31_->pdata;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp32__length1 = (gint) _data_->_tmp31_->len;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp33_ = 0;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp33_ = _data_->i;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp34_ = NULL;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp34_ = _data_->_tmp32_[_data_->_tmp33_];
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp35_ = NULL;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp35_ = pk_package_get_id (_data_->_tmp34_);
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp36_ = NULL;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp36_ = g_strdup (_data_->_tmp35_);
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_g_free0 (_data_->_tmp29_[_data_->_tmp30_]);
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp29_[_data_->_tmp30_] = _data_->_tmp36_;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp37_ = NULL;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_data_->_tmp37_ = _data_->_tmp29_[_data_->_tmp30_];
+#line 8133 "ui.c"
+			}
+		}
+	}
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp39_ = NULL;
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp39_ = _data_->task;
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp40_ = NULL;
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp40__length1 = 0;
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp40_ = _data_->package_ids;
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp40__length1 = _data_->package_ids_length1;
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp41_ = NULL;
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp41__target = NULL;
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp41_ = _data_->progress_callback;
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp41__target = _data_->progress_callback_target;
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_state_ = 2;
+#line 1689 "/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 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return FALSE;
+#line 8163 "ui.c"
+	_state_2:
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp42_ = NULL;
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp42_ = pk_task_generic_finish (_data_->_tmp39_, _data_->_res_, &_data_->_inner_error_);
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp38_ = _data_->_tmp42_;
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
+#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 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_error_free (_data_->_inner_error_);
+#line 1689 "/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 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_ptr_array_unref0 (_data_->package_array);
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_data_->_tmp1_);
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_data_->results);
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_data_->task);
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_data_->_state_ == 0) {
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_simple_async_result_complete_in_idle (_data_->_async_result);
+#line 8191 "ui.c"
+		} else {
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_simple_async_result_complete (_data_->_async_result);
+#line 8195 "ui.c"
+		}
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_object_unref (_data_->_async_result);
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return FALSE;
+#line 8201 "ui.c"
+	}
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp43_ = NULL;
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp43_ = _data_->_tmp38_;
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->_tmp38_ = NULL;
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data_->result = _data_->_tmp43_;
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (_data_->_tmp38_);
+#line 1689 "/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 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_ptr_array_unref0 (_data_->package_array);
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (_data_->_tmp1_);
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (_data_->results);
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (_data_->task);
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_data_->_state_ == 0) {
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_simple_async_result_complete_in_idle (_data_->_async_result);
+#line 8227 "ui.c"
+	} else {
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_simple_async_result_complete (_data_->_async_result);
+#line 8231 "ui.c"
+	}
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_unref (_data_->_async_result);
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return FALSE;
+#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (_data_->_tmp38_);
+#line 1675 "/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 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_ptr_array_unref0 (_data_->package_array);
+#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (_data_->_tmp1_);
+#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (_data_->results);
+#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (_data_->task);
+#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_data_->_state_ == 0) {
+#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_simple_async_result_complete_in_idle (_data_->_async_result);
+#line 8253 "ui.c"
+	} else {
+#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_simple_async_result_complete (_data_->_async_result);
+#line 8257 "ui.c"
+	}
+#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_unref (_data_->_async_result);
+#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return FALSE;
+#line 8263 "ui.c"
 }
 
 
@@ -7130,36 +8281,36 @@ static gboolean user_interface_simple_scan_window_window_state_event_cb (UserInt
 	gboolean result = FALSE;
 	GdkEventWindowState* _tmp0_ = NULL;
 	GdkWindowState _tmp1_ = 0;
-#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = event;
-#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_->changed_mask;
-#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((_tmp1_ & GDK_WINDOW_STATE_MAXIMIZED) != 0) {
-#line 7135 "ui.c"
+#line 8283 "ui.c"
 		GdkEventWindowState* _tmp2_ = NULL;
 		GdkWindowState _tmp3_ = 0;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = event;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _tmp2_->new_window_state;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_is_maximized = (_tmp3_ & GDK_WINDOW_STATE_MAXIMIZED) != 0;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, FALSE);
-#line 7146 "ui.c"
+#line 8294 "ui.c"
 	}
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 7152 "ui.c"
+#line 8300 "ui.c"
 }
 
 
@@ -7168,26 +8319,26 @@ static gboolean _user_interface_simple_scan_window_window_state_event_cb_gtk_wid
 	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 7161 "ui.c"
+#line 8309 "ui.c"
 }
 
 
 static gboolean user_interface_window_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_on_quit (self);
-#line 1575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = !_tmp0_;
-#line 1575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 7180 "ui.c"
+#line 8328 "ui.c"
 }
 
 
@@ -7196,7 +8347,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 7189 "ui.c"
+#line 8337 "ui.c"
 }
 
 
@@ -7210,37 +8361,37 @@ static void user_interface_page_size_changed_cb (UserInterface* self, Page* page
 	Page* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-#line 1578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_width (_tmp0_);
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_width = _tmp2_;
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page;
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_get_height (_tmp3_);
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_height = _tmp5_;
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = page;
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = page_get_dpi (_tmp6_);
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _tmp7_;
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_dpi = _tmp8_;
-#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, FALSE);
-#line 7233 "ui.c"
+#line 8381 "ui.c"
 }
 
 
@@ -7248,35 +8399,35 @@ static void user_interface_page_scan_direction_changed_cb (UserInterface* self,
 	Page* _tmp0_ = NULL;
 	ScanDirection _tmp1_ = 0;
 	ScanDirection _tmp2_ = 0;
-#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_scan_direction (_tmp0_);
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_scan_direction = _tmp2_;
-#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, FALSE);
-#line 7255 "ui.c"
+#line 8403 "ui.c"
 }
 
 
 static void _user_interface_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self) {
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_size_changed_cb ((UserInterface*) self, _sender);
-#line 7262 "ui.c"
+#line 8410 "ui.c"
 }
 
 
 static void _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self) {
-#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_scan_direction_changed_cb ((UserInterface*) self, _sender);
-#line 7269 "ui.c"
+#line 8417 "ui.c"
 }
 
 
@@ -7287,46 +8438,46 @@ static void user_interface_page_added_cb (UserInterface* self, Book* book, Page*
 	ScanDirection _tmp3_ = 0;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_size_changed_cb (self, _tmp0_);
-#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page;
-#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page_get_scan_direction (_tmp1_);
-#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_scan_direction = _tmp3_;
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1727 "/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 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1728 "/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 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 7308 "ui.c"
+#line 8456 "ui.c"
 }
 
 
 static void user_interface_reordered_cb (UserInterface* self, Book* book) {
-#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 7319 "ui.c"
+#line 8467 "ui.c"
 }
 
 
@@ -7338,39 +8489,39 @@ static void user_interface_page_removed_cb (UserInterface* self, Book* book, Pag
 	Book* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
 	guint _tmp6_ = 0U;
-#line 1607 "/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 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1607 "/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 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("size-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1740 "/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 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page;
-#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("scan-direction-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1741 "/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 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book;
-#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_get_n_pages (_tmp4_);
-#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _tmp5_;
-#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp6_ == ((guint) 0)) {
-#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_add_default_page (self);
-#line 7359 "ui.c"
+#line 8507 "ui.c"
 	}
-#line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 7363 "ui.c"
+#line 8511 "ui.c"
 }
 
 
@@ -7392,79 +8543,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 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (combo != NULL);
-#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp0_;
-#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = combo;
-#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = renderer;
-#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp1_, (GtkCellRenderer*) _tmp2_, TRUE);
-#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = combo;
-#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = renderer;
-#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp3_, (GtkCellRenderer*) _tmp4_, "text", 1);
-#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = combo;
-#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = gtk_combo_box_get_model (_tmp5_);
-#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _tmp6_;
-#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1756 "/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 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	model = _tmp8_;
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = g_new0 (gint, 6);
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[0] = 75;
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[1] = 150;
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[2] = 300;
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[3] = 600;
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[4] = 1200;
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[5] = 2400;
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions = _tmp9_;
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions_length1 = 6;
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_resolutions_size_ = scan_resolutions_length1;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = scan_resolutions;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10__length1 = scan_resolutions_length1;
-#line 7441 "ui.c"
+#line 8589 "ui.c"
 	{
 		gint* dpi_collection = NULL;
 		gint dpi_collection_length1 = 0;
 		gint _dpi_collection_size_ = 0;
 		gint dpi_it = 0;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi_collection = _tmp10_;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi_collection_length1 = _tmp10__length1;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		for (dpi_it = 0; dpi_it < _tmp10__length1; dpi_it = dpi_it + 1) {
-#line 7453 "ui.c"
+#line 8601 "ui.c"
 			gint dpi = 0;
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			dpi = dpi_collection[dpi_it];
-#line 7457 "ui.c"
+#line 8605 "ui.c"
 			{
 				gchar* label = NULL;
 				gint _tmp11_ = 0;
@@ -7478,133 +8629,133 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 				const gchar* _tmp32_ = NULL;
 				gint _tmp33_ = 0;
 				gint _tmp34_ = 0;
-#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp11_ = dpi;
-#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = default_dpi;
-#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp11_ == _tmp12_) {
-#line 7477 "ui.c"
+#line 8625 "ui.c"
 					const gchar* _tmp13_ = NULL;
 					gint _tmp14_ = 0;
 					gchar* _tmp15_ = NULL;
-#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp13_ = _ ("%d dpi (default)");
-#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp14_ = dpi;
-#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp15_ = g_strdup_printf (_tmp13_, _tmp14_);
-#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (label);
-#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					label = _tmp15_;
-#line 7491 "ui.c"
+#line 8639 "ui.c"
 				} else {
 					gint _tmp16_ = 0;
-#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp16_ = dpi;
-#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (_tmp16_ == 75) {
-#line 7498 "ui.c"
+#line 8646 "ui.c"
 						const gchar* _tmp17_ = NULL;
 						gint _tmp18_ = 0;
 						gchar* _tmp19_ = NULL;
-#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp17_ = _ ("%d dpi (draft)");
-#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp18_ = dpi;
-#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp19_ = g_strdup_printf (_tmp17_, _tmp18_);
-#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_g_free0 (label);
-#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						label = _tmp19_;
-#line 7512 "ui.c"
+#line 8660 "ui.c"
 					} else {
 						gint _tmp20_ = 0;
-#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp20_ = dpi;
-#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						if (_tmp20_ == 1200) {
-#line 7519 "ui.c"
+#line 8667 "ui.c"
 							const gchar* _tmp21_ = NULL;
 							gint _tmp22_ = 0;
 							gchar* _tmp23_ = NULL;
-#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp21_ = _ ("%d dpi (high resolution)");
-#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp22_ = dpi;
-#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp23_ = g_strdup_printf (_tmp21_, _tmp22_);
-#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (label);
-#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							label = _tmp23_;
-#line 7533 "ui.c"
+#line 8681 "ui.c"
 						} else {
 							const gchar* _tmp24_ = NULL;
 							gint _tmp25_ = 0;
 							gchar* _tmp26_ = NULL;
-#line 1641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp24_ = _ ("%d dpi");
-#line 1641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp25_ = dpi;
-#line 1641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp26_ = g_strdup_printf (_tmp24_, _tmp25_);
-#line 1641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (label);
-#line 1641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							label = _tmp26_;
-#line 7548 "ui.c"
+#line 8696 "ui.c"
 						}
 					}
 				}
-#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp27_ = model;
-#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_list_store_append (_tmp27_, &_tmp28_);
-#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				iter = _tmp28_;
-#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp29_ = model;
-#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp30_ = iter;
-#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp31_ = dpi;
-#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp32_ = label;
-#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_list_store_set (_tmp29_, &_tmp30_, 0, _tmp31_, 1, _tmp32_, -1, -1);
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp33_ = dpi;
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp34_ = current_dpi;
-#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp33_ == _tmp34_) {
-#line 7574 "ui.c"
+#line 8722 "ui.c"
 					GtkComboBox* _tmp35_ = NULL;
 					GtkTreeIter _tmp36_ = {0};
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp35_ = combo;
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp36_ = iter;
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_combo_box_set_active_iter (_tmp35_, &_tmp36_);
-#line 7583 "ui.c"
+#line 8731 "ui.c"
 				}
-#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (label);
-#line 7587 "ui.c"
+#line 8735 "ui.c"
 			}
 		}
 	}
-#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions = (g_free (scan_resolutions), NULL);
-#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (model);
-#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 7597 "ui.c"
+#line 8745 "ui.c"
 }
 
 
@@ -7625,257 +8776,257 @@ static void user_interface_needs_saving_cb (UserInterface* self, Book* book) {
 	gboolean _tmp13_ = FALSE;
 	gboolean _tmp14_ = FALSE;
 	GtkMenuItem* _tmp16_ = NULL;
-#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->save_menuitem;
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book;
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_needs_saving (_tmp1_);
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp3_);
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->save_button;
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book;
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_needs_saving (_tmp5_);
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _tmp6_;
-#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp4_, _tmp7_);
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->save_toolbutton;
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = book;
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = book_get_needs_saving (_tmp9_);
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = _tmp10_;
-#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp8_, _tmp11_);
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = book;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = book_get_needs_saving (_tmp12_);
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = _tmp13_;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp14_) {
-#line 7660 "ui.c"
+#line 8808 "ui.c"
 		GtkMenuItem* _tmp15_ = NULL;
-#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = self->priv->save_as_menuitem;
-#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp15_, TRUE);
-#line 7666 "ui.c"
+#line 8814 "ui.c"
 	}
-#line 1659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = self->priv->copy_to_clipboard_menuitem;
-#line 1659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp16_, TRUE);
-#line 7672 "ui.c"
+#line 8820 "ui.c"
 }
 
 
 static void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self) {
-#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_info_bar_response_cb ((UserInterface*) self, _sender, response_id);
-#line 7679 "ui.c"
+#line 8827 "ui.c"
 }
 
 
-static void __lambda11_ (UserInterface* self) {
+static void __lambda14_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_text_dpi (self);
-#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "text-dpi", _tmp1_);
-#line 7692 "ui.c"
+#line 8840 "ui.c"
 }
 
 
-static void ___lambda11__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda11_ ((UserInterface*) self);
-#line 7699 "ui.c"
+static void ___lambda14__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda14_ ((UserInterface*) self);
+#line 8847 "ui.c"
 }
 
 
-static void __lambda12_ (UserInterface* self) {
+static void __lambda15_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_photo_dpi (self);
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "photo-dpi", _tmp1_);
-#line 7712 "ui.c"
+#line 8860 "ui.c"
 }
 
 
-static void ___lambda12__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda12_ ((UserInterface*) self);
-#line 7719 "ui.c"
+static void ___lambda15__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda15_ ((UserInterface*) self);
+#line 8867 "ui.c"
 }
 
 
-static void __lambda13_ (UserInterface* self) {
+static void __lambda16_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	ScanType _tmp1_ = 0;
-#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_page_side (self);
-#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_enum (_tmp0_, "page-side", (gint) _tmp1_);
-#line 7732 "ui.c"
+#line 8880 "ui.c"
 }
 
 
-static void ___lambda13__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda13_ ((UserInterface*) self);
-#line 7739 "ui.c"
+static void ___lambda16__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda16_ ((UserInterface*) self);
+#line 8887 "ui.c"
 }
 
 
-static void __lambda14_ (UserInterface* self) {
+static void __lambda17_ (UserInterface* self) {
 	gint w = 0;
 	gint h = 0;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
 	GSettings* _tmp2_ = NULL;
 	GSettings* _tmp3_ = NULL;
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_get_paper_size (self, &_tmp0_, &_tmp1_);
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	w = _tmp0_;
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	h = _tmp1_;
-#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->settings;
-#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp2_, "paper-width", w);
-#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->settings;
-#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp3_, "paper-height", h);
-#line 7764 "ui.c"
+#line 8912 "ui.c"
 }
 
 
-static void ___lambda14__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda14_ ((UserInterface*) self);
-#line 7771 "ui.c"
+static void ___lambda17__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda17_ ((UserInterface*) self);
+#line 8919 "ui.c"
 }
 
 
-static void __lambda15_ (UserInterface* self) {
+static void __lambda18_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_brightness (self);
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "brightness", _tmp2_);
-#line 7787 "ui.c"
+#line 8935 "ui.c"
 }
 
 
-static void ___lambda15__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda15_ ((UserInterface*) self);
-#line 7794 "ui.c"
+static void ___lambda18__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
+#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda18_ ((UserInterface*) self);
+#line 8942 "ui.c"
 }
 
 
-static void __lambda16_ (UserInterface* self) {
+static void __lambda19_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_contrast (self);
-#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "contrast", _tmp2_);
-#line 7810 "ui.c"
+#line 8958 "ui.c"
 }
 
 
-static void ___lambda16__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda16_ ((UserInterface*) self);
-#line 7817 "ui.c"
+static void ___lambda19__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
+#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda19_ ((UserInterface*) self);
+#line 8965 "ui.c"
 }
 
 
-static void __lambda17_ (UserInterface* self) {
+static void __lambda20_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "jpeg-quality", _tmp2_);
-#line 7833 "ui.c"
+#line 8981 "ui.c"
 }
 
 
-static void ___lambda17__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda17_ ((UserInterface*) self);
-#line 7840 "ui.c"
+static void ___lambda20__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
+#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda20_ ((UserInterface*) self);
+#line 8988 "ui.c"
 }
 
 
 static void _user_interface_page_selected_cb_book_view_page_selected (BookView* _sender, Page* page, gpointer self) {
-#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_selected_cb ((UserInterface*) self, _sender, page);
-#line 7847 "ui.c"
+#line 8995 "ui.c"
 }
 
 
 static void _user_interface_show_page_cb_book_view_show_page (BookView* _sender, Page* page, gpointer self) {
-#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_page_cb ((UserInterface*) self, _sender, page);
-#line 7854 "ui.c"
+#line 9002 "ui.c"
 }
 
 
 static void _user_interface_show_page_menu_cb_book_view_show_menu (BookView* _sender, gpointer self) {
-#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_page_menu_cb ((UserInterface*) self, _sender);
-#line 7861 "ui.c"
+#line 9009 "ui.c"
 }
 
 
 static void _user_interface_book_saving_cb_book_saving (Book* _sender, gint i, gpointer self) {
-#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_book_saving_cb ((UserInterface*) self, i);
-#line 7868 "ui.c"
+#line 9016 "ui.c"
 }
 
 
@@ -7919,16 +9070,16 @@ static void user_interface_load (UserInterface* self) {
 	const gchar* _tmp85_ = NULL;
 	GtkButton* _tmp86_ = NULL;
 	GtkButton* _tmp87_ = NULL;
+	GtkInfoBar* _tmp88_ = NULL;
+	const gchar* _tmp89_ = NULL;
+	GtkButton* _tmp90_ = NULL;
+	GtkButton* _tmp91_ = NULL;
 	GtkTreeIter iter = {0};
-	GtkListStore* _tmp88_ = NULL;
-	GtkTreeIter _tmp89_ = {0};
-	GtkListStore* _tmp90_ = NULL;
-	GtkTreeIter _tmp91_ = {0};
-	const gchar* _tmp92_ = NULL;
-	GtkListStore* _tmp93_ = NULL;
-	GtkTreeIter _tmp94_ = {0};
-	GtkListStore* _tmp95_ = NULL;
-	GtkTreeIter _tmp96_ = {0};
+	GtkListStore* _tmp92_ = NULL;
+	GtkTreeIter _tmp93_ = {0};
+	GtkListStore* _tmp94_ = NULL;
+	GtkTreeIter _tmp95_ = {0};
+	const gchar* _tmp96_ = NULL;
 	GtkListStore* _tmp97_ = NULL;
 	GtkTreeIter _tmp98_ = {0};
 	GtkListStore* _tmp99_ = NULL;
@@ -7949,213 +9100,217 @@ static void user_interface_load (UserInterface* self) {
 	GtkTreeIter _tmp114_ = {0};
 	GtkListStore* _tmp115_ = NULL;
 	GtkTreeIter _tmp116_ = {0};
+	GtkListStore* _tmp117_ = NULL;
+	GtkTreeIter _tmp118_ = {0};
+	GtkListStore* _tmp119_ = NULL;
+	GtkTreeIter _tmp120_ = {0};
 	gint dpi = 0;
-	GSettings* _tmp117_ = NULL;
-	gint _tmp118_ = 0;
-	gint _tmp119_ = 0;
-	GtkComboBox* _tmp120_ = NULL;
-	gint _tmp121_ = 0;
-	GtkComboBox* _tmp122_ = NULL;
-	GSettings* _tmp123_ = NULL;
-	gint _tmp124_ = 0;
+	GSettings* _tmp121_ = NULL;
+	gint _tmp122_ = 0;
+	gint _tmp123_ = 0;
+	GtkComboBox* _tmp124_ = NULL;
 	gint _tmp125_ = 0;
 	GtkComboBox* _tmp126_ = NULL;
-	gint _tmp127_ = 0;
-	GtkComboBox* _tmp128_ = NULL;
-	GtkCellRendererText* renderer = NULL;
-	GtkCellRendererText* _tmp129_ = NULL;
+	GSettings* _tmp127_ = NULL;
+	gint _tmp128_ = 0;
+	gint _tmp129_ = 0;
 	GtkComboBox* _tmp130_ = NULL;
-	GtkCellRendererText* _tmp131_ = NULL;
+	gint _tmp131_ = 0;
 	GtkComboBox* _tmp132_ = NULL;
+	GtkCellRendererText* renderer = NULL;
 	GtkCellRendererText* _tmp133_ = NULL;
-	GtkCellRendererText* _tmp134_ = NULL;
-	GtkComboBox* _tmp135_ = NULL;
-	GtkCellRendererText* _tmp136_ = NULL;
-	GtkComboBox* _tmp137_ = NULL;
+	GtkComboBox* _tmp134_ = NULL;
+	GtkCellRendererText* _tmp135_ = NULL;
+	GtkComboBox* _tmp136_ = NULL;
+	GtkCellRendererText* _tmp137_ = NULL;
 	GtkCellRendererText* _tmp138_ = NULL;
-	GSettings* _tmp139_ = NULL;
-	gint _tmp140_ = 0;
+	GtkComboBox* _tmp139_ = NULL;
+	GtkCellRendererText* _tmp140_ = NULL;
 	GtkComboBox* _tmp141_ = NULL;
 	GtkCellRendererText* _tmp142_ = NULL;
-	GtkComboBox* _tmp143_ = NULL;
-	GtkCellRendererText* _tmp144_ = NULL;
+	GSettings* _tmp143_ = NULL;
+	gint _tmp144_ = 0;
 	GtkComboBox* _tmp145_ = NULL;
 	GtkCellRendererText* _tmp146_ = NULL;
+	GtkComboBox* _tmp147_ = NULL;
+	GtkCellRendererText* _tmp148_ = NULL;
+	GtkComboBox* _tmp149_ = NULL;
+	GtkCellRendererText* _tmp150_ = NULL;
 	gint paper_width = 0;
-	GSettings* _tmp147_ = NULL;
-	gint _tmp148_ = 0;
-	gint paper_height = 0;
-	GSettings* _tmp149_ = NULL;
-	gint _tmp150_ = 0;
-	gint _tmp151_ = 0;
+	GSettings* _tmp151_ = NULL;
 	gint _tmp152_ = 0;
-	GtkComboBox* _tmp153_ = NULL;
+	gint paper_height = 0;
+	GSettings* _tmp153_ = NULL;
+	gint _tmp154_ = 0;
+	gint _tmp155_ = 0;
+	gint _tmp156_ = 0;
+	GtkComboBox* _tmp157_ = NULL;
 	gdouble lower = 0.0;
-	GtkAdjustment* _tmp154_ = NULL;
-	gdouble _tmp155_ = 0.0;
-	gdouble _tmp156_ = 0.0;
+	GtkAdjustment* _tmp158_ = NULL;
+	gdouble _tmp159_ = 0.0;
+	gdouble _tmp160_ = 0.0;
 	gchar* darker_label = NULL;
-	const gchar* _tmp157_ = NULL;
-	gchar* _tmp158_ = NULL;
+	const gchar* _tmp161_ = NULL;
+	gchar* _tmp162_ = NULL;
 	gdouble upper = 0.0;
-	GtkAdjustment* _tmp159_ = NULL;
-	gdouble _tmp160_ = 0.0;
-	gdouble _tmp161_ = 0.0;
-	gchar* lighter_label = NULL;
-	const gchar* _tmp162_ = NULL;
-	gchar* _tmp163_ = NULL;
-	GtkScale* _tmp164_ = NULL;
+	GtkAdjustment* _tmp163_ = NULL;
+	gdouble _tmp164_ = 0.0;
 	gdouble _tmp165_ = 0.0;
+	gchar* lighter_label = NULL;
 	const gchar* _tmp166_ = NULL;
-	GtkScale* _tmp167_ = NULL;
+	gchar* _tmp167_ = NULL;
 	GtkScale* _tmp168_ = NULL;
 	gdouble _tmp169_ = 0.0;
 	const gchar* _tmp170_ = NULL;
-	GSettings* _tmp171_ = NULL;
-	gint _tmp172_ = 0;
-	GtkAdjustment* _tmp173_ = NULL;
-	GtkAdjustment* _tmp174_ = NULL;
-	gdouble _tmp175_ = 0.0;
-	gdouble _tmp176_ = 0.0;
-	gchar* less_label = NULL;
-	const gchar* _tmp177_ = NULL;
-	gchar* _tmp178_ = NULL;
-	GtkAdjustment* _tmp179_ = NULL;
+	GtkScale* _tmp171_ = NULL;
+	GtkScale* _tmp172_ = NULL;
+	gdouble _tmp173_ = 0.0;
+	const gchar* _tmp174_ = NULL;
+	GSettings* _tmp175_ = NULL;
+	gint _tmp176_ = 0;
+	GtkAdjustment* _tmp177_ = NULL;
+	GtkAdjustment* _tmp178_ = NULL;
+	gdouble _tmp179_ = 0.0;
 	gdouble _tmp180_ = 0.0;
-	gdouble _tmp181_ = 0.0;
-	gchar* more_label = NULL;
-	const gchar* _tmp182_ = NULL;
-	gchar* _tmp183_ = NULL;
-	GtkScale* _tmp184_ = NULL;
+	gchar* less_label = NULL;
+	const gchar* _tmp181_ = NULL;
+	gchar* _tmp182_ = NULL;
+	GtkAdjustment* _tmp183_ = NULL;
+	gdouble _tmp184_ = 0.0;
 	gdouble _tmp185_ = 0.0;
+	gchar* more_label = NULL;
 	const gchar* _tmp186_ = NULL;
-	GtkScale* _tmp187_ = NULL;
+	gchar* _tmp187_ = NULL;
 	GtkScale* _tmp188_ = NULL;
 	gdouble _tmp189_ = 0.0;
 	const gchar* _tmp190_ = NULL;
-	GSettings* _tmp191_ = NULL;
-	gint _tmp192_ = 0;
-	GtkAdjustment* _tmp193_ = NULL;
-	GtkAdjustment* _tmp194_ = NULL;
-	gdouble _tmp195_ = 0.0;
-	gdouble _tmp196_ = 0.0;
-	gchar* minimum_label = NULL;
-	const gchar* _tmp197_ = NULL;
-	gchar* _tmp198_ = NULL;
-	GtkAdjustment* _tmp199_ = NULL;
+	GtkScale* _tmp191_ = NULL;
+	GtkScale* _tmp192_ = NULL;
+	gdouble _tmp193_ = 0.0;
+	const gchar* _tmp194_ = NULL;
+	GSettings* _tmp195_ = NULL;
+	gint _tmp196_ = 0;
+	GtkAdjustment* _tmp197_ = NULL;
+	GtkAdjustment* _tmp198_ = NULL;
+	gdouble _tmp199_ = 0.0;
 	gdouble _tmp200_ = 0.0;
-	gdouble _tmp201_ = 0.0;
-	gchar* maximum_label = NULL;
-	const gchar* _tmp202_ = NULL;
-	gchar* _tmp203_ = NULL;
-	GtkScale* _tmp204_ = NULL;
+	gchar* minimum_label = NULL;
+	const gchar* _tmp201_ = NULL;
+	gchar* _tmp202_ = NULL;
+	GtkAdjustment* _tmp203_ = NULL;
+	gdouble _tmp204_ = 0.0;
 	gdouble _tmp205_ = 0.0;
+	gchar* maximum_label = NULL;
 	const gchar* _tmp206_ = NULL;
-	GtkScale* _tmp207_ = NULL;
+	gchar* _tmp207_ = NULL;
 	GtkScale* _tmp208_ = NULL;
 	gdouble _tmp209_ = 0.0;
 	const gchar* _tmp210_ = NULL;
-	GSettings* _tmp211_ = NULL;
-	gint _tmp212_ = 0;
-	GtkAdjustment* _tmp213_ = NULL;
+	GtkScale* _tmp211_ = NULL;
+	GtkScale* _tmp212_ = NULL;
+	gdouble _tmp213_ = 0.0;
+	const gchar* _tmp214_ = NULL;
+	GSettings* _tmp215_ = NULL;
+	gint _tmp216_ = 0;
+	GtkAdjustment* _tmp217_ = NULL;
 	gchar* device = NULL;
-	GSettings* _tmp214_ = NULL;
-	gchar* _tmp215_ = NULL;
-	const gchar* _tmp216_ = NULL;
+	GSettings* _tmp218_ = NULL;
+	gchar* _tmp219_ = NULL;
+	const gchar* _tmp220_ = NULL;
 	gchar* document_type = NULL;
-	GSettings* _tmp222_ = NULL;
-	gchar* _tmp223_ = NULL;
-	const gchar* _tmp224_ = NULL;
-	Book* _tmp226_ = NULL;
-	BookView* _tmp227_ = NULL;
-	BookView* _tmp228_ = NULL;
-	GtkBox* _tmp229_ = NULL;
-	BookView* _tmp230_ = NULL;
+	GSettings* _tmp226_ = NULL;
+	gchar* _tmp227_ = NULL;
+	const gchar* _tmp228_ = NULL;
+	Book* _tmp230_ = NULL;
 	BookView* _tmp231_ = NULL;
 	BookView* _tmp232_ = NULL;
-	BookView* _tmp233_ = NULL;
+	GtkBox* _tmp233_ = NULL;
 	BookView* _tmp234_ = NULL;
-	GtkDialog* _tmp235_ = NULL;
-	GtkDialog* _tmp236_ = NULL;
-	gint _tmp237_ = 0;
-	gint _tmp238_ = 0;
-	gint _tmp239_ = 0;
-	gint _tmp240_ = 0;
-	gboolean _tmp241_ = FALSE;
-	const gchar* _tmp242_ = NULL;
-	ProgressBarDialog* _tmp243_ = NULL;
-	Book* _tmp244_ = NULL;
-#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	BookView* _tmp235_ = NULL;
+	BookView* _tmp236_ = NULL;
+	BookView* _tmp237_ = NULL;
+	BookView* _tmp238_ = NULL;
+	GtkDialog* _tmp239_ = NULL;
+	GtkDialog* _tmp240_ = NULL;
+	gint _tmp241_ = 0;
+	gint _tmp242_ = 0;
+	gint _tmp243_ = 0;
+	gint _tmp244_ = 0;
+	gboolean _tmp245_ = FALSE;
+	const gchar* _tmp246_ = NULL;
+	ProgressBarDialog* _tmp247_ = NULL;
+	Book* _tmp248_ = NULL;
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_icon_theme_get_default ();
-#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_icon_theme_append_search_path (_tmp0_, ICON_DIR);
-#line 1666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_default_icon_name ("scanner");
-#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_application_get_default ();
-#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1799 "/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 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	app = _tmp2_;
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = user_interface_is_desktop (self, "Unity");
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp6_) {
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = TRUE;
-#line 8098 "ui.c"
+#line 9250 "ui.c"
 	} else {
 		gboolean _tmp7_ = FALSE;
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = user_interface_is_desktop (self, "XFCE");
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp7_;
-#line 8105 "ui.c"
+#line 9257 "ui.c"
 	}
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_) {
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = TRUE;
-#line 8111 "ui.c"
+#line 9263 "ui.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = user_interface_is_desktop (self, "MATE");
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = _tmp8_;
-#line 8118 "ui.c"
+#line 9270 "ui.c"
 	}
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = TRUE;
-#line 8124 "ui.c"
+#line 9276 "ui.c"
 	} else {
 		gboolean _tmp9_ = FALSE;
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = user_interface_is_desktop (self, "LXDE");
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _tmp9_;
-#line 8131 "ui.c"
+#line 9283 "ui.c"
 	}
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 8135 "ui.c"
+#line 9287 "ui.c"
 		GtkMenuBar* _tmp10_ = NULL;
 		GtkToolbar* _tmp11_ = NULL;
-#line 1672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_window_set_titlebar ((GtkWindow*) self, NULL);
-#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = self->priv->menubar;
-#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_visible ((GtkWidget*) _tmp10_, TRUE);
-#line 1674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = self->priv->toolbar;
-#line 1674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
-#line 8148 "ui.c"
+#line 9300 "ui.c"
 	} else {
 		GtkApplication* _tmp12_ = NULL;
 		GMenu* appmenu = NULL;
@@ -8207,841 +9362,853 @@ static void user_interface_load (UserInterface* self) {
 		GtkApplication* _tmp56_ = NULL;
 		GtkApplication* _tmp57_ = NULL;
 		GtkApplication* _tmp58_ = NULL;
-#line 1678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = app;
-#line 1678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1809 "/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 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = g_menu_new ();
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		appmenu = _tmp13_;
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = g_menu_new ();
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp14_;
-#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = appmenu;
-#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = section;
-#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp15_, NULL, (GMenuModel*) _tmp16_);
-#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = section;
-#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp18_ = _ ("New Document");
-#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp17_, _tmp18_, "app.new_document");
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = g_menu_new ();
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp19_;
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp20_ = appmenu;
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp21_ = section;
-#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp20_, NULL, (GMenuModel*) _tmp21_);
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp22_ = g_menu_new ();
-#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		menu = _tmp22_;
-#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp23_ = section;
-#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp24_ = _ ("Document");
-#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp25_ = menu;
-#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_submenu (_tmp23_, _tmp24_, (GMenuModel*) _tmp25_);
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp26_ = menu;
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp27_ = _ ("Reorder Pages");
-#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp26_, _tmp27_, "app.reorder");
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp28_ = menu;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp29_ = _ ("Save");
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp28_, _tmp29_, "app.save");
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp30_ = menu;
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp31_ = _ ("Save As...");
-#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp30_, _tmp31_, "app.save_as");
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp32_ = menu;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp33_ = _ ("Email...");
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp32_, _tmp33_, "app.email");
-#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp34_ = menu;
-#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp35_ = _ ("Print...");
-#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp34_, _tmp35_, "app.print");
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp36_ = g_menu_new ();
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp36_;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp37_ = appmenu;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp38_ = section;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp37_, NULL, (GMenuModel*) _tmp38_);
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp39_ = section;
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp40_ = _ ("Preferences");
-#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp39_, _tmp40_, "app.preferences");
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp41_ = g_menu_new ();
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp41_;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp42_ = appmenu;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp43_ = section;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp42_, NULL, (GMenuModel*) _tmp43_);
-#line 1701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp44_ = section;
-#line 1701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp45_ = _ ("Help");
-#line 1701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp44_, _tmp45_, "app.help");
-#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp46_ = section;
-#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp47_ = _ ("About");
-#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp46_, _tmp47_, "app.about");
-#line 1703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp48_ = section;
-#line 1703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp49_ = _ ("Quit");
-#line 1703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp48_, _tmp49_, "app.quit");
-#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp50_ = app;
-#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp51_ = appmenu;
-#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_set_app_menu (_tmp50_, (GMenuModel*) _tmp51_);
-#line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp52_ = app;
-#line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp52_, "<Ctrl>N", "app.new_document", NULL);
-#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp53_ = app;
-#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp53_, "<Ctrl>S", "app.save", NULL);
-#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp54_ = app;
-#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp54_, "<Shift><Ctrl>S", "app.save_as", NULL);
-#line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp55_ = app;
-#line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp55_, "<Ctrl>E", "app.email", NULL);
-#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp56_ = app;
-#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp56_, "<Ctrl>P", "app.print", NULL);
-#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp57_ = app;
-#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp57_, "F1", "app.help", NULL);
-#line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp58_ = app;
-#line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp58_, "<Ctrl>Q", "app.quit", NULL);
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (menu);
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (appmenu);
-#line 8366 "ui.c"
+#line 9518 "ui.c"
 	}
-#line 1715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp59_ = app;
-#line 1715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_application_add_window (_tmp59_, (GtkWindow*) self);
-#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp60_ = (GtkInfoBar*) gtk_info_bar_new ();
-#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp60_);
-#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar);
-#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar = _tmp60_;
-#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp61_ = self->priv->info_bar;
-#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1850 "/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 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp62_ = self->priv->main_vbox;
-#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp63_ = self->priv->info_bar;
-#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp62_, (GtkWidget*) _tmp63_, FALSE, TRUE, (guint) 0);
-#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp64_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp64_);
-#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	hbox = _tmp64_;
-#line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp65_ = self->priv->info_bar;
-#line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp66_ = gtk_info_bar_get_content_area (_tmp65_);
-#line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1853 "/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 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	content_area = _tmp67_;
-#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp68_ = content_area;
-#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp69_ = hbox;
-#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add (_tmp68_, (GtkWidget*) _tmp69_);
-#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp70_ = hbox;
-#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp70_, TRUE);
-#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp71_ = (GtkImage*) gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG);
-#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp71_);
-#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_image);
-#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_image = _tmp71_;
-#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp72_ = hbox;
-#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp73_ = self->priv->info_bar_image;
-#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp72_, (GtkWidget*) _tmp73_, FALSE, TRUE, (guint) 0);
-#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp74_ = self->priv->info_bar_image;
-#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp74_, TRUE);
-#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp75_ = (GtkLabel*) gtk_label_new (NULL);
-#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp75_);
-#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_label);
-#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_label = _tmp75_;
-#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp76_ = self->priv->info_bar_label;
-#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_misc_set_alignment ((GtkMisc*) _tmp76_, 0.0f, 0.5f);
-#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp77_ = hbox;
-#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp78_ = self->priv->info_bar_label;
-#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp77_, (GtkWidget*) _tmp78_, TRUE, TRUE, (guint) 0);
-#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp79_ = self->priv->info_bar_label;
-#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp79_, TRUE);
-#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp80_ = self->priv->info_bar;
-#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp81_ = _ ("_Close");
-#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp82_ = gtk_info_bar_add_button (_tmp80_, _tmp81_, (gint) GTK_RESPONSE_CLOSE);
-#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1866 "/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 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_close_button);
-#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_close_button = _tmp83_;
-#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp84_ = self->priv->info_bar;
-#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp85_ = _ ("Change _Scanner");
-#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp86_ = gtk_info_bar_add_button (_tmp84_, _tmp85_, 1);
-#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1867 "/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 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_change_scanner_button);
-#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_change_scanner_button = _tmp87_;
-#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp88_ = self->priv->paper_size_model;
-#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp88_, &_tmp89_);
-#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp89_;
-#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp90_ = self->priv->paper_size_model;
-#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp91_ = iter;
-#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp92_ = _ ("Automatic");
-#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp90_, &_tmp91_, 0, 0, 1, 0, 2, _tmp92_, -1, -1);
-#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp93_ = self->priv->paper_size_model;
-#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp93_, &_tmp94_);
-#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp94_;
-#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp95_ = self->priv->paper_size_model;
-#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp96_ = iter;
-#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp95_, &_tmp96_, 0, 1050, 1, 1480, 2, "A6", -1, -1);
-#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp88_ = self->priv->info_bar;
+#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp89_ = _ ("_Install Drivers");
+#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp90_ = gtk_info_bar_add_button (_tmp88_, _tmp89_, 2);
+#line 1869 "/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 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->info_bar_install_button);
+#line 1869 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar_install_button = _tmp91_;
+#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp92_ = self->priv->paper_size_model;
+#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp92_, &_tmp93_);
+#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp93_;
+#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp94_ = self->priv->paper_size_model;
+#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp95_ = iter;
+#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp96_ = _ ("Automatic");
+#line 1874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp94_, &_tmp95_, 0, 0, 1, 0, 2, _tmp96_, -1, -1);
+#line 1877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp97_ = self->priv->paper_size_model;
-#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp97_, &_tmp98_);
-#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp98_;
-#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp99_ = self->priv->paper_size_model;
-#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp100_ = iter;
-#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp99_, &_tmp100_, 0, 1480, 1, 2100, 2, "A5", -1, -1);
-#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp99_, &_tmp100_, 0, 1050, 1, 1480, 2, "A6", -1, -1);
+#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp101_ = self->priv->paper_size_model;
-#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp101_, &_tmp102_);
-#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp102_;
-#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp103_ = self->priv->paper_size_model;
-#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp104_ = iter;
-#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp103_, &_tmp104_, 0, 2100, 1, 2970, 2, "A4", -1, -1);
-#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp103_, &_tmp104_, 0, 1480, 1, 2100, 2, "A5", -1, -1);
+#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp105_ = self->priv->paper_size_model;
-#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp105_, &_tmp106_);
-#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp106_;
-#line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp107_ = self->priv->paper_size_model;
-#line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp108_ = iter;
-#line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp107_, &_tmp108_, 0, 2159, 1, 2794, 2, "Letter", -1, -1);
-#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp107_, &_tmp108_, 0, 2100, 1, 2970, 2, "A4", -1, -1);
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp109_ = self->priv->paper_size_model;
-#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp109_, &_tmp110_);
-#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp110_;
-#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp111_ = self->priv->paper_size_model;
-#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp112_ = iter;
-#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp111_, &_tmp112_, 0, 2159, 1, 3556, 2, "Legal", -1, -1);
-#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp111_, &_tmp112_, 0, 2159, 1, 2794, 2, "Letter", -1, -1);
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp113_ = self->priv->paper_size_model;
-#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp113_, &_tmp114_);
-#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp114_;
-#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp115_ = self->priv->paper_size_model;
-#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp116_ = iter;
-#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp115_, &_tmp116_, 0, 1016, 1, 1524, 2, "4×6", -1, -1);
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp117_ = self->priv->settings;
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp118_ = g_settings_get_int (_tmp117_, "text-dpi");
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dpi = _tmp118_;
-#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp119_ = dpi;
-#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp119_ <= 0) {
-#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp115_, &_tmp116_, 0, 2159, 1, 3556, 2, "Legal", -1, -1);
+#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp117_ = self->priv->paper_size_model;
+#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp117_, &_tmp118_);
+#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp118_;
+#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp119_ = self->priv->paper_size_model;
+#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp120_ = iter;
+#line 1888 "/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 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp121_ = self->priv->settings;
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp122_ = g_settings_get_int (_tmp121_, "text-dpi");
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	dpi = _tmp122_;
+#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp123_ = dpi;
+#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp123_ <= 0) {
+#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-#line 8576 "ui.c"
-	}
-#line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp120_ = self->priv->text_dpi_combo;
-#line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp121_ = dpi;
-#line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_dpi_combo (self, _tmp120_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp121_);
-#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp122_ = self->priv->text_dpi_combo;
-#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp122_, "changed", (GCallback) ___lambda11__gtk_combo_box_changed, self, 0);
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp123_ = self->priv->settings;
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp124_ = g_settings_get_int (_tmp123_, "photo-dpi");
-#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dpi = _tmp124_;
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 9740 "ui.c"
+	}
+#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp124_ = self->priv->text_dpi_combo;
+#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp125_ = dpi;
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp125_ <= 0) {
-#line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_dpi_combo (self, _tmp124_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp125_);
+#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp126_ = self->priv->text_dpi_combo;
+#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp126_, "changed", (GCallback) ___lambda14__gtk_combo_box_changed, self, 0);
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp127_ = self->priv->settings;
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp128_ = g_settings_get_int (_tmp127_, "photo-dpi");
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	dpi = _tmp128_;
+#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp129_ = dpi;
+#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp129_ <= 0) {
+#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-#line 8600 "ui.c"
-	}
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp126_ = self->priv->photo_dpi_combo;
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp127_ = dpi;
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_dpi_combo (self, _tmp126_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp127_);
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp128_ = self->priv->photo_dpi_combo;
-#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp128_, "changed", (GCallback) ___lambda12__gtk_combo_box_changed, self, 0);
-#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp129_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp129_);
-#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp129_;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp130_ = self->priv->device_combo;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp131_ = renderer;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp130_, (GtkCellRenderer*) _tmp131_, TRUE);
-#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp132_ = self->priv->device_combo;
-#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp133_ = renderer;
-#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp132_, (GtkCellRenderer*) _tmp133_, "text", 1);
-#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp134_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp134_);
-#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 9764 "ui.c"
+	}
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp130_ = self->priv->photo_dpi_combo;
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp131_ = dpi;
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_dpi_combo (self, _tmp130_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp131_);
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp132_ = self->priv->photo_dpi_combo;
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp132_, "changed", (GCallback) ___lambda15__gtk_combo_box_changed, self, 0);
+#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp133_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp133_);
+#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	renderer = _tmp133_;
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp134_ = self->priv->device_combo;
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp135_ = renderer;
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp134_, (GtkCellRenderer*) _tmp135_, TRUE);
+#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp136_ = self->priv->device_combo;
+#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp137_ = renderer;
+#line 1903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp136_, (GtkCellRenderer*) _tmp137_, "text", 1);
+#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp138_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp138_);
+#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp134_;
-#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp135_ = self->priv->page_side_combo;
-#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp136_ = renderer;
-#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp135_, (GtkCellRenderer*) _tmp136_, TRUE);
-#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp137_ = self->priv->page_side_combo;
-#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp138_ = renderer;
-#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp137_, (GtkCellRenderer*) _tmp138_, "text", 1);
-#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp139_ = self->priv->settings;
-#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp140_ = g_settings_get_enum (_tmp139_, "page-side");
-#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_page_side (self, (ScanType) _tmp140_);
-#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	renderer = _tmp138_;
+#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp139_ = self->priv->page_side_combo;
+#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp140_ = renderer;
+#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp139_, (GtkCellRenderer*) _tmp140_, TRUE);
+#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp141_ = self->priv->page_side_combo;
-#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp141_, "changed", (GCallback) ___lambda13__gtk_combo_box_changed, self, 0);
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp142_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp142_);
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp142_ = renderer;
+#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp141_, (GtkCellRenderer*) _tmp142_, "text", 1);
+#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp143_ = self->priv->settings;
+#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp144_ = g_settings_get_enum (_tmp143_, "page-side");
+#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_page_side (self, (ScanType) _tmp144_);
+#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp145_ = self->priv->page_side_combo;
+#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp145_, "changed", (GCallback) ___lambda16__gtk_combo_box_changed, self, 0);
+#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp146_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp146_);
+#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp142_;
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp143_ = self->priv->paper_size_combo;
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp144_ = renderer;
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp143_, (GtkCellRenderer*) _tmp144_, TRUE);
-#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp145_ = self->priv->paper_size_combo;
-#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp146_ = renderer;
-#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp145_, (GtkCellRenderer*) _tmp146_, "text", 2);
-#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp147_ = self->priv->settings;
-#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp148_ = g_settings_get_int (_tmp147_, "paper-width");
-#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	paper_width = _tmp148_;
-#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp149_ = self->priv->settings;
-#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp150_ = g_settings_get_int (_tmp149_, "paper-height");
-#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	paper_height = _tmp150_;
-#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp151_ = paper_width;
-#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp152_ = paper_height;
-#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_paper_size (self, _tmp151_, _tmp152_);
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp153_ = self->priv->paper_size_combo;
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp153_, "changed", (GCallback) ___lambda14__gtk_combo_box_changed, self, 0);
-#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp154_ = self->priv->brightness_adjustment;
-#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp155_ = gtk_adjustment_get_lower (_tmp154_);
-#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp156_ = _tmp155_;
-#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lower = _tmp156_;
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp157_ = _ ("Darker");
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp158_ = g_strdup_printf ("<small>%s</small>", _tmp157_);
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	darker_label = _tmp158_;
-#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp159_ = self->priv->brightness_adjustment;
-#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp160_ = gtk_adjustment_get_upper (_tmp159_);
-#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp161_ = _tmp160_;
-#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	upper = _tmp161_;
-#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp162_ = _ ("Lighter");
-#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp163_ = g_strdup_printf ("<small>%s</small>", _tmp162_);
-#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lighter_label = _tmp163_;
-#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp164_ = self->priv->brightness_scale;
-#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp165_ = lower;
-#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp166_ = darker_label;
-#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp164_, _tmp165_, GTK_POS_BOTTOM, _tmp166_);
-#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp167_ = self->priv->brightness_scale;
-#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp167_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	renderer = _tmp146_;
+#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp147_ = self->priv->paper_size_combo;
+#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp148_ = renderer;
+#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp147_, (GtkCellRenderer*) _tmp148_, TRUE);
+#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp149_ = self->priv->paper_size_combo;
+#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp150_ = renderer;
+#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp149_, (GtkCellRenderer*) _tmp150_, "text", 2);
+#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp151_ = self->priv->settings;
+#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp152_ = g_settings_get_int (_tmp151_, "paper-width");
+#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	paper_width = _tmp152_;
+#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp153_ = self->priv->settings;
+#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp154_ = g_settings_get_int (_tmp153_, "paper-height");
+#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	paper_height = _tmp154_;
+#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp155_ = paper_width;
+#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp156_ = paper_height;
+#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_paper_size (self, _tmp155_, _tmp156_);
+#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp157_ = self->priv->paper_size_combo;
+#line 1917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp157_, "changed", (GCallback) ___lambda17__gtk_combo_box_changed, self, 0);
+#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp158_ = self->priv->brightness_adjustment;
+#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp159_ = gtk_adjustment_get_lower (_tmp158_);
+#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp160_ = _tmp159_;
+#line 1925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lower = _tmp160_;
+#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp161_ = _ ("Darker");
+#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp162_ = g_strdup_printf ("<small>%s</small>", _tmp161_);
+#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	darker_label = _tmp162_;
+#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp163_ = self->priv->brightness_adjustment;
+#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp164_ = gtk_adjustment_get_upper (_tmp163_);
+#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp165_ = _tmp164_;
+#line 1927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	upper = _tmp165_;
+#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp166_ = _ ("Lighter");
+#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp167_ = g_strdup_printf ("<small>%s</small>", _tmp166_);
+#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lighter_label = _tmp167_;
+#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp168_ = self->priv->brightness_scale;
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp169_ = upper;
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp170_ = lighter_label;
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp169_ = lower;
+#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp170_ = darker_label;
+#line 1929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp168_, _tmp169_, GTK_POS_BOTTOM, _tmp170_);
-#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp171_ = self->priv->settings;
-#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp172_ = g_settings_get_int (_tmp171_, "brightness");
-#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_brightness (self, _tmp172_);
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp173_ = self->priv->brightness_adjustment;
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp173_, "value-changed", (GCallback) ___lambda15__gtk_adjustment_value_changed, self, 0);
-#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp174_ = self->priv->contrast_adjustment;
-#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp175_ = gtk_adjustment_get_lower (_tmp174_);
-#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp176_ = _tmp175_;
-#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lower = _tmp176_;
-#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp177_ = _ ("Less");
-#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp178_ = g_strdup_printf ("<small>%s</small>", _tmp177_);
-#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	less_label = _tmp178_;
-#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp179_ = self->priv->contrast_adjustment;
-#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp180_ = gtk_adjustment_get_upper (_tmp179_);
-#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp181_ = _tmp180_;
-#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	upper = _tmp181_;
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp182_ = _ ("More");
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp183_ = g_strdup_printf ("<small>%s</small>", _tmp182_);
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	more_label = _tmp183_;
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp184_ = self->priv->contrast_scale;
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp185_ = lower;
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp186_ = less_label;
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp184_, _tmp185_, GTK_POS_BOTTOM, _tmp186_);
-#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp187_ = self->priv->contrast_scale;
-#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp187_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
-#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp171_ = self->priv->brightness_scale;
+#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp171_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
+#line 1931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp172_ = self->priv->brightness_scale;
+#line 1931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp173_ = upper;
+#line 1931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp174_ = lighter_label;
+#line 1931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp172_, _tmp173_, GTK_POS_BOTTOM, _tmp174_);
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp175_ = self->priv->settings;
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp176_ = g_settings_get_int (_tmp175_, "brightness");
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_brightness (self, _tmp176_);
+#line 1933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp177_ = self->priv->brightness_adjustment;
+#line 1933 "/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 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp178_ = self->priv->contrast_adjustment;
+#line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp179_ = gtk_adjustment_get_lower (_tmp178_);
+#line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp180_ = _tmp179_;
+#line 1935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lower = _tmp180_;
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp181_ = _ ("Less");
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp182_ = g_strdup_printf ("<small>%s</small>", _tmp181_);
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	less_label = _tmp182_;
+#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp183_ = self->priv->contrast_adjustment;
+#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp184_ = gtk_adjustment_get_upper (_tmp183_);
+#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp185_ = _tmp184_;
+#line 1937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	upper = _tmp185_;
+#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp186_ = _ ("More");
+#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp187_ = g_strdup_printf ("<small>%s</small>", _tmp186_);
+#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	more_label = _tmp187_;
+#line 1939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp188_ = self->priv->contrast_scale;
-#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp189_ = upper;
-#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp190_ = more_label;
-#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp189_ = lower;
+#line 1939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp190_ = less_label;
+#line 1939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp188_, _tmp189_, GTK_POS_BOTTOM, _tmp190_);
-#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp191_ = self->priv->settings;
-#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp192_ = g_settings_get_int (_tmp191_, "contrast");
-#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_contrast (self, _tmp192_);
-#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp193_ = self->priv->contrast_adjustment;
-#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp193_, "value-changed", (GCallback) ___lambda16__gtk_adjustment_value_changed, self, 0);
-#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp194_ = self->priv->quality_adjustment;
-#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp195_ = gtk_adjustment_get_lower (_tmp194_);
-#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp196_ = _tmp195_;
-#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lower = _tmp196_;
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp197_ = _ ("Minimum");
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp198_ = g_strdup_printf ("<small>%s</small>", _tmp197_);
-#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	minimum_label = _tmp198_;
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp199_ = self->priv->quality_adjustment;
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp200_ = gtk_adjustment_get_upper (_tmp199_);
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp201_ = _tmp200_;
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	upper = _tmp201_;
-#line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp202_ = _ ("Maximum");
-#line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp203_ = g_strdup_printf ("<small>%s</small>", _tmp202_);
-#line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	maximum_label = _tmp203_;
-#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp204_ = self->priv->quality_scale;
-#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp205_ = lower;
-#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp206_ = minimum_label;
-#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp204_, _tmp205_, GTK_POS_BOTTOM, _tmp206_);
-#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp207_ = self->priv->quality_scale;
-#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp207_, (gdouble) 75, GTK_POS_BOTTOM, NULL);
-#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp191_ = self->priv->contrast_scale;
+#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp191_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
+#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp192_ = self->priv->contrast_scale;
+#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp193_ = upper;
+#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp194_ = more_label;
+#line 1941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp192_, _tmp193_, GTK_POS_BOTTOM, _tmp194_);
+#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp195_ = self->priv->settings;
+#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp196_ = g_settings_get_int (_tmp195_, "contrast");
+#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_contrast (self, _tmp196_);
+#line 1943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp197_ = self->priv->contrast_adjustment;
+#line 1943 "/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 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp198_ = self->priv->quality_adjustment;
+#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp199_ = gtk_adjustment_get_lower (_tmp198_);
+#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp200_ = _tmp199_;
+#line 1945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lower = _tmp200_;
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp201_ = _ ("Minimum");
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp202_ = g_strdup_printf ("<small>%s</small>", _tmp201_);
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	minimum_label = _tmp202_;
+#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp203_ = self->priv->quality_adjustment;
+#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp204_ = gtk_adjustment_get_upper (_tmp203_);
+#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp205_ = _tmp204_;
+#line 1947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	upper = _tmp205_;
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp206_ = _ ("Maximum");
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp207_ = g_strdup_printf ("<small>%s</small>", _tmp206_);
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	maximum_label = _tmp207_;
+#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp208_ = self->priv->quality_scale;
-#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp209_ = upper;
-#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp210_ = maximum_label;
-#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp209_ = lower;
+#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp210_ = minimum_label;
+#line 1949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp208_, _tmp209_, GTK_POS_BOTTOM, _tmp210_);
-#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp211_ = self->priv->settings;
-#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp212_ = g_settings_get_int (_tmp211_, "jpeg-quality");
-#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_quality (self, _tmp212_);
-#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp213_ = self->priv->quality_adjustment;
-#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp213_, "value-changed", (GCallback) ___lambda17__gtk_adjustment_value_changed, self, 0);
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp214_ = self->priv->settings;
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp215_ = g_settings_get_string (_tmp214_, "selected-device");
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	device = _tmp215_;
-#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp216_ = device;
-#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp216_ != NULL) {
-#line 8886 "ui.c"
-		const gchar* _tmp217_ = NULL;
-		GtkTreeIter _tmp218_ = {0};
-		gboolean _tmp219_ = FALSE;
-#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp217_ = device;
-#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp219_ = user_interface_find_scan_device (self, _tmp217_, &_tmp218_);
-#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		iter = _tmp218_;
-#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp219_) {
-#line 8898 "ui.c"
-			GtkComboBox* _tmp220_ = NULL;
-			GtkTreeIter _tmp221_ = {0};
-#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp220_ = self->priv->device_combo;
-#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp221_ = iter;
-#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_combo_box_set_active_iter (_tmp220_, &_tmp221_);
-#line 8907 "ui.c"
+#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp211_ = self->priv->quality_scale;
+#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp211_, (gdouble) 75, GTK_POS_BOTTOM, NULL);
+#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp212_ = self->priv->quality_scale;
+#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp213_ = upper;
+#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp214_ = maximum_label;
+#line 1951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp212_, _tmp213_, GTK_POS_BOTTOM, _tmp214_);
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp215_ = self->priv->settings;
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp216_ = g_settings_get_int (_tmp215_, "jpeg-quality");
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_quality (self, _tmp216_);
+#line 1953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp217_ = self->priv->quality_adjustment;
+#line 1953 "/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 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp218_ = self->priv->settings;
+#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp219_ = g_settings_get_string (_tmp218_, "selected-device");
+#line 1955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	device = _tmp219_;
+#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp220_ = device;
+#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp220_ != NULL) {
+#line 10050 "ui.c"
+		const gchar* _tmp221_ = NULL;
+		GtkTreeIter _tmp222_ = {0};
+		gboolean _tmp223_ = FALSE;
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp221_ = device;
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp223_ = user_interface_find_scan_device (self, _tmp221_, &_tmp222_);
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		iter = _tmp222_;
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_tmp223_) {
+#line 10062 "ui.c"
+			GtkComboBox* _tmp224_ = NULL;
+			GtkTreeIter _tmp225_ = {0};
+#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp224_ = self->priv->device_combo;
+#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp225_ = iter;
+#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gtk_combo_box_set_active_iter (_tmp224_, &_tmp225_);
+#line 10071 "ui.c"
 		}
 	}
-#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp222_ = self->priv->settings;
-#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp223_ = g_settings_get_string (_tmp222_, "document-type");
-#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	document_type = _tmp223_;
-#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp224_ = document_type;
-#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp224_ != NULL) {
-#line 8920 "ui.c"
-		const gchar* _tmp225_ = NULL;
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp225_ = document_type;
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_document_hint (self, _tmp225_, FALSE);
-#line 8926 "ui.c"
+#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp226_ = self->priv->settings;
+#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp227_ = g_settings_get_string (_tmp226_, "document-type");
+#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	document_type = _tmp227_;
+#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp228_ = document_type;
+#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp228_ != NULL) {
+#line 10084 "ui.c"
+		const gchar* _tmp229_ = NULL;
+#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp229_ = document_type;
+#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_set_document_hint (self, _tmp229_, FALSE);
+#line 10090 "ui.c"
 	}
-#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp226_ = self->priv->_book;
-#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp227_ = book_view_new (_tmp226_);
-#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp227_);
-#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp230_ = self->priv->_book;
+#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp231_ = book_view_new (_tmp230_);
+#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp231_);
+#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->book_view);
-#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->book_view = _tmp227_;
-#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp228_ = self->priv->book_view;
-#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_set_border_width ((GtkContainer*) _tmp228_, (guint) 18);
-#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp229_ = self->priv->main_vbox;
-#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp230_ = self->priv->book_view;
-#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_end (_tmp229_, (GtkWidget*) _tmp230_, TRUE, TRUE, (guint) 0);
-#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp231_ = self->priv->book_view;
-#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp231_, "page-selected", (GCallback) _user_interface_page_selected_cb_book_view_page_selected, self, 0);
-#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->book_view = _tmp231_;
+#line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp232_ = self->priv->book_view;
-#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp232_, "show-page", (GCallback) _user_interface_show_page_cb_book_view_show_page, self, 0);
-#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp233_ = self->priv->book_view;
-#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp233_, "show-menu", (GCallback) _user_interface_show_page_menu_cb_book_view_show_menu, self, 0);
-#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1967 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_container_set_border_width ((GtkContainer*) _tmp232_, (guint) 18);
+#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp233_ = self->priv->main_vbox;
+#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp234_ = self->priv->book_view;
-#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp234_, TRUE);
-#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp235_ = self->priv->authorize_dialog;
-#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_transient_for ((GtkWindow*) _tmp235_, (GtkWindow*) self);
-#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp236_ = self->priv->preferences_dialog;
-#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_transient_for ((GtkWindow*) _tmp236_, (GtkWindow*) self);
-#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_end (_tmp233_, (GtkWidget*) _tmp234_, TRUE, TRUE, (guint) 0);
+#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp235_ = self->priv->book_view;
+#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp235_, "page-selected", (GCallback) _user_interface_page_selected_cb_book_view_page_selected, self, 0);
+#line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp236_ = self->priv->book_view;
+#line 1970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp236_, "show-page", (GCallback) _user_interface_show_page_cb_book_view_show_page, self, 0);
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp237_ = self->priv->book_view;
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp237_, "show-menu", (GCallback) _user_interface_show_page_menu_cb_book_view_show_menu, self, 0);
+#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp238_ = self->priv->book_view;
+#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp238_, TRUE);
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp239_ = self->priv->authorize_dialog;
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_transient_for ((GtkWindow*) _tmp239_, (GtkWindow*) self);
+#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp240_ = self->priv->preferences_dialog;
+#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_transient_for ((GtkWindow*) _tmp240_, (GtkWindow*) self);
+#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_load_state (self);
-#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp237_ = self->priv->window_width;
-#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp238_ = self->priv->window_height;
-#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:1848: Restoring window to %dx%d pixels", _tmp237_, _tmp238_);
-#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp239_ = self->priv->window_width;
-#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp240_ = self->priv->window_height;
-#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_default_size ((GtkWindow*) self, _tmp239_, _tmp240_);
-#line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp241_ = self->priv->window_is_maximized;
-#line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp241_) {
-#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_debug ("ui.vala:1852: Restoring window to maximized");
-#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp241_ = self->priv->window_width;
+#line 1981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp242_ = self->priv->window_height;
+#line 1981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:1981: Restoring window to %dx%d pixels", _tmp241_, _tmp242_);
+#line 1982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp243_ = self->priv->window_width;
+#line 1982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp244_ = self->priv->window_height;
+#line 1982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_default_size ((GtkWindow*) self, _tmp243_, _tmp244_);
+#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp245_ = self->priv->window_is_maximized;
+#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp245_) {
+#line 1985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_debug ("ui.vala:1985: Restoring window to maximized");
+#line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_window_maximize ((GtkWindow*) self);
-#line 8994 "ui.c"
-	}
-#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp242_ = _ ("Saving document...");
-#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp243_ = progress_bar_dialog_new ((GtkApplicationWindow*) self, _tmp242_);
-#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp243_);
-#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 10158 "ui.c"
+	}
+#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp246_ = _ ("Saving document...");
+#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp247_ = progress_bar_dialog_new ((GtkApplicationWindow*) self, _tmp246_);
+#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp247_);
+#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->progress_dialog = _tmp243_;
-#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp244_ = self->priv->_book;
-#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect_object (_tmp244_, "saving", (GCallback) _user_interface_book_saving_cb_book_saving, self, 0);
-#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->progress_dialog = _tmp247_;
+#line 1990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp248_ = self->priv->_book;
+#line 1990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp248_, "saving", (GCallback) _user_interface_book_saving_cb_book_saving, self, 0);
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (document_type);
-#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (device);
-#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (maximum_label);
-#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (minimum_label);
-#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (more_label);
-#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (less_label);
-#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (lighter_label);
-#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (darker_label);
-#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (content_area);
-#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
-#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (app);
-#line 9034 "ui.c"
+#line 10198 "ui.c"
 }
 
 
@@ -9054,89 +10221,89 @@ static gboolean user_interface_is_desktop (UserInterface* self, const gchar* nam
 	const gchar* _tmp3_ = NULL;
 	gchar** _tmp4_ = NULL;
 	gchar** _tmp5_ = NULL;
-#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (name != NULL, FALSE);
-#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_getenv ("XDG_CURRENT_DESKTOP");
-#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	desktop_name_list = _tmp1_;
-#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = desktop_name_list;
-#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_ == NULL) {
-#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (desktop_name_list);
-#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 9067 "ui.c"
+#line 10231 "ui.c"
 	}
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = desktop_name_list;
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_ = g_strsplit (_tmp3_, ":", 0);
-#line 9073 "ui.c"
+#line 10237 "ui.c"
 	{
 		gchar** n_collection = NULL;
 		gint n_collection_length1 = 0;
 		gint _n_collection_size_ = 0;
 		gint n_it = 0;
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		n_collection = _tmp5_;
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		n_collection_length1 = _vala_array_length (_tmp4_);
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1999 "/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 9085 "ui.c"
+#line 10249 "ui.c"
 			gchar* _tmp6_ = NULL;
 			gchar* n = NULL;
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp6_ = g_strdup (n_collection[n_it]);
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			n = _tmp6_;
-#line 9092 "ui.c"
+#line 10256 "ui.c"
 			{
 				const gchar* _tmp7_ = NULL;
 				const gchar* _tmp8_ = NULL;
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = n;
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = name;
-#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					result = TRUE;
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (n);
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					n_collection = (_vala_array_free (n_collection, n_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (desktop_name_list);
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					return result;
-#line 9112 "ui.c"
+#line 10276 "ui.c"
 				}
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (n);
-#line 9116 "ui.c"
+#line 10280 "ui.c"
 			}
 		}
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		n_collection = (_vala_array_free (n_collection, n_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 9121 "ui.c"
+#line 10285 "ui.c"
 	}
-#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (desktop_name_list);
-#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9129 "ui.c"
+#line 10293 "ui.c"
 }
 
 
@@ -9164,363 +10331,363 @@ static void user_interface_load_state (UserInterface* self) {
 	gchar* _tmp26_ = NULL;
 	gchar* _tmp27_ = NULL;
 	GQuark _tmp29_ = 0U;
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp28_label0 = 0;
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp28_label1 = 0;
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp28_label2 = 0;
-#line 9163 "ui.c"
+#line 10327 "ui.c"
 	GError * _inner_error_ = NULL;
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_get_state_filename (self);
-#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_;
-#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:1880: Loading state from %s", _tmp2_);
-#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:2013: Loading state from %s", _tmp2_);
+#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp2_);
-#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_key_file_new ();
-#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	f = _tmp3_;
-#line 9181 "ui.c"
+#line 10345 "ui.c"
 	{
 		GKeyFile* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = f;
-#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_state_filename (self);
-#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _tmp6_;
-#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_key_file_load_from_file (_tmp4_, _tmp7_, G_KEY_FILE_NONE, &_inner_error_);
-#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp7_);
-#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9201 "ui.c"
-			goto __catch21_g_error;
+#line 10365 "ui.c"
+			goto __catch23_g_error;
 		}
 	}
-	goto __finally21;
-	__catch21_g_error:
+	goto __finally23;
+	__catch23_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp8_ = NULL;
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = e;
-#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!g_error_matches (_tmp8_, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
-#line 9218 "ui.c"
+#line 10382 "ui.c"
 			GError* _tmp9_ = NULL;
 			const gchar* _tmp10_ = NULL;
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = e;
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = _tmp9_->message;
-#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_warning ("ui.vala:1890: Failed to load state: %s", _tmp10_);
-#line 9227 "ui.c"
+#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_warning ("ui.vala:2023: Failed to load state: %s", _tmp10_);
+#line 10391 "ui.c"
 		}
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 9231 "ui.c"
+#line 10395 "ui.c"
 	}
-	__finally21:
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally23:
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_key_file_unref0 (f);
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/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 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 9244 "ui.c"
+#line 10408 "ui.c"
 	}
-#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = f;
-#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = user_interface_state_get_integer (self, _tmp11_, "window", "width", 600);
-#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_width = _tmp12_;
-#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->window_width;
-#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp13_ <= 0) {
-#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_width = 600;
-#line 9258 "ui.c"
+#line 10422 "ui.c"
 	}
-#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = f;
-#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = user_interface_state_get_integer (self, _tmp14_, "window", "height", 400);
-#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_height = _tmp15_;
-#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = self->priv->window_height;
-#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp16_ <= 0) {
-#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_height = 400;
-#line 9272 "ui.c"
+#line 10436 "ui.c"
 	}
-#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = f;
-#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = user_interface_state_get_boolean (self, _tmp17_, "window", "is-maximized", FALSE);
-#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_is_maximized = _tmp18_;
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = f;
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = user_interface_state_get_integer (self, _tmp19_, "last-page", "width", 595);
-#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_width = _tmp20_;
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = f;
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = user_interface_state_get_integer (self, _tmp21_, "last-page", "height", 842);
-#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_height = _tmp22_;
-#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = f;
-#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = user_interface_state_get_integer (self, _tmp23_, "last-page", "dpi", 72);
-#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_dpi = _tmp24_;
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = f;
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/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 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = _tmp26_;
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = (NULL == _tmp27_) ? 0 : g_quark_from_string (_tmp27_);
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_free (_tmp27_);
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/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 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 9312 "ui.c"
+#line 10476 "ui.c"
 			default:
 			{
-#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 9319 "ui.c"
+#line 10483 "ui.c"
 			}
 		}
 	} else if (_tmp29_ == ((0 != _tmp28_label1) ? _tmp28_label1 : (_tmp28_label1 = g_quark_from_static_string ("left-to-right")))) {
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 9325 "ui.c"
+#line 10489 "ui.c"
 			default:
 			{
-#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
-#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 9332 "ui.c"
+#line 10496 "ui.c"
 			}
 		}
 	} else if (_tmp29_ == ((0 != _tmp28_label2) ? _tmp28_label2 : (_tmp28_label2 = g_quark_from_static_string ("right-to-left")))) {
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 9338 "ui.c"
+#line 10502 "ui.c"
 			default:
 			{
-#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
-#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 9345 "ui.c"
+#line 10509 "ui.c"
 			}
 		}
 	} else {
-#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 9351 "ui.c"
+#line 10515 "ui.c"
 			default:
 			{
-#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 9358 "ui.c"
+#line 10522 "ui.c"
 			}
 		}
 	}
-#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_key_file_unref0 (f);
-#line 9364 "ui.c"
+#line 10528 "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 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, 0);
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, 0);
-#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, 0);
-#line 9379 "ui.c"
+#line 10543 "ui.c"
 	{
 		gint _tmp0_ = 0;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_integer (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9398 "ui.c"
-			goto __catch22_g_error;
+#line 10562 "ui.c"
+			goto __catch24_g_error;
 		}
-#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp0_;
-#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 9405 "ui.c"
+#line 10569 "ui.c"
 	}
-	goto __finally22;
-	__catch22_g_error:
+	goto __finally24;
+	__catch24_g_error:
 	{
 		gint _tmp5_ = 0;
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _default_;
-#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 9421 "ui.c"
+#line 10585 "ui.c"
 	}
-	__finally22:
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally24:
+#line 2055 "/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 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return 0;
-#line 9430 "ui.c"
+#line 10594 "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 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, FALSE);
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, FALSE);
-#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
-#line 9445 "ui.c"
+#line 10609 "ui.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_boolean (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9464 "ui.c"
-			goto __catch23_g_error;
+#line 10628 "ui.c"
+			goto __catch25_g_error;
 		}
-#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp0_;
-#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 9471 "ui.c"
+#line 10635 "ui.c"
 	}
-	goto __finally23;
-	__catch23_g_error:
+	goto __finally25;
+	__catch25_g_error:
 	{
 		gboolean _tmp5_ = FALSE;
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _default_;
-#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 9487 "ui.c"
+#line 10651 "ui.c"
 	}
-	__finally23:
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally25:
+#line 2067 "/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 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return FALSE;
-#line 9496 "ui.c"
+#line 10660 "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 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, NULL);
-#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, NULL);
-#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (_default_ != NULL, NULL);
-#line 9513 "ui.c"
+#line 10677 "ui.c"
 	{
 		gchar* _tmp0_ = NULL;
 		GKeyFile* _tmp1_ = NULL;
@@ -9528,83 +10695,83 @@ static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f,
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_string (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9533 "ui.c"
-			goto __catch24_g_error;
+#line 10697 "ui.c"
+			goto __catch26_g_error;
 		}
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp0_;
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = NULL;
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp0_);
-#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 9546 "ui.c"
+#line 10710 "ui.c"
 	}
-	goto __finally24;
-	__catch24_g_error:
+	goto __finally26;
+	__catch26_g_error:
 	{
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _default_;
-#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = g_strdup (_tmp6_);
-#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp7_;
-#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 9565 "ui.c"
+#line 10729 "ui.c"
 	}
-	__finally24:
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally26:
+#line 2079 "/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 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return NULL;
-#line 9574 "ui.c"
+#line 10738 "ui.c"
 }
 
 
-static gboolean ___lambda10_ (UserInterface* self) {
+static gboolean ___lambda11_ (UserInterface* self) {
 	gboolean result = FALSE;
-#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2097 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, TRUE);
-#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_state_timeout = (guint) 0;
-#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9588 "ui.c"
+#line 10752 "ui.c"
 }
 
 
-static gboolean ____lambda10__gsource_func (gpointer self) {
+static gboolean ____lambda11__gsource_func (gpointer self) {
 	gboolean result;
-	result = ___lambda10_ ((UserInterface*) self);
-#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = ___lambda11_ ((UserInterface*) self);
+#line 2095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9597 "ui.c"
+#line 10761 "ui.c"
 }
 
 
@@ -9629,145 +10796,145 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 	gint _tmp19_ = 0;
 	ScanDirection _tmp20_ = 0;
 	GError * _inner_error_ = NULL;
-#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = force;
-#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp0_) {
-#line 9628 "ui.c"
+#line 10792 "ui.c"
 		guint _tmp1_ = 0U;
 		guint _tmp3_ = 0U;
-#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = self->priv->save_state_timeout;
-#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp1_ != ((guint) 0)) {
-#line 9635 "ui.c"
+#line 10799 "ui.c"
 			guint _tmp2_ = 0U;
-#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp2_ = self->priv->save_state_timeout;
-#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_source_remove (_tmp2_);
-#line 9641 "ui.c"
+#line 10805 "ui.c"
 		}
-#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda10__gsource_func, g_object_ref (self), g_object_unref);
-#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2095 "/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 2095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->save_state_timeout = _tmp3_;
-#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 9649 "ui.c"
+#line 10813 "ui.c"
 	}
-#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = user_interface_get_state_filename (self);
-#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _tmp5_;
-#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:1971: Saving state to %s", _tmp6_);
-#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:2104: Saving state to %s", _tmp6_);
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp6_);
-#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = g_key_file_new ();
-#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	f = _tmp7_;
-#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = f;
-#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->window_width;
-#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp8_, "window", "width", _tmp9_);
-#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = f;
-#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = self->priv->window_height;
-#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp10_, "window", "height", _tmp11_);
-#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = f;
-#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->window_is_maximized;
-#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_boolean (_tmp12_, "window", "is-maximized", _tmp13_);
-#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = f;
-#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->default_page_width;
-#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp14_, "last-page", "width", _tmp15_);
-#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = f;
-#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->default_page_height;
-#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp16_, "last-page", "height", _tmp17_);
-#line 1979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = f;
-#line 1979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = self->priv->default_page_dpi;
-#line 1979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp18_, "last-page", "dpi", _tmp19_);
-#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = self->priv->default_page_scan_direction;
-#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (_tmp20_) {
-#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 9707 "ui.c"
+#line 10871 "ui.c"
 		{
 			GKeyFile* _tmp21_ = NULL;
-#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp21_ = f;
-#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp21_, "last-page", "scan-direction", "top-to-bottom");
-#line 1984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 9716 "ui.c"
+#line 10880 "ui.c"
 		}
-#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 9720 "ui.c"
+#line 10884 "ui.c"
 		{
 			GKeyFile* _tmp22_ = NULL;
-#line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp22_ = f;
-#line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp22_, "last-page", "scan-direction", "bottom-to-top");
-#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2120 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 9729 "ui.c"
+#line 10893 "ui.c"
 		}
-#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 9733 "ui.c"
+#line 10897 "ui.c"
 		{
 			GKeyFile* _tmp23_ = NULL;
-#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp23_ = f;
-#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp23_, "last-page", "scan-direction", "left-to-right");
-#line 1990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 9742 "ui.c"
+#line 10906 "ui.c"
 		}
-#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 9746 "ui.c"
+#line 10910 "ui.c"
 		{
 			GKeyFile* _tmp24_ = NULL;
-#line 1992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp24_ = f;
-#line 1992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp24_, "last-page", "scan-direction", "right-to-left");
-#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 9755 "ui.c"
+#line 10919 "ui.c"
 		}
 		default:
-#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 9760 "ui.c"
+#line 10924 "ui.c"
 	}
 	{
 		gchar* _tmp25_ = NULL;
@@ -9776,90 +10943,90 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 		GKeyFile* _tmp28_ = NULL;
 		gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp25_ = user_interface_get_state_filename (self);
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp26_ = _tmp25_;
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp27_ = _tmp26_;
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp28_ = f;
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp29_ = g_key_file_to_data (_tmp28_, NULL, NULL);
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp30_ = _tmp29_;
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_file_set_contents (_tmp27_, _tmp30_, (gssize) (-1), &_inner_error_);
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp30_);
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp27_);
-#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9789 "ui.c"
-			goto __catch25_g_error;
+#line 10953 "ui.c"
+			goto __catch27_g_error;
 		}
 	}
-	goto __finally25;
-	__catch25_g_error:
+	goto __finally27;
+	__catch27_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp31_ = NULL;
 		const gchar* _tmp32_ = NULL;
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp31_ = e;
-#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp32_ = _tmp31_->message;
-#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:2001: Failed to write state: %s", _tmp32_);
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:2134: Failed to write state: %s", _tmp32_);
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 9811 "ui.c"
+#line 10975 "ui.c"
 	}
-	__finally25:
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally27:
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_key_file_unref0 (f);
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/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 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 9824 "ui.c"
+#line 10988 "ui.c"
 	}
-#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_key_file_unref0 (f);
-#line 9828 "ui.c"
+#line 10992 "ui.c"
 }
 
 
-static gboolean ___lambda18_ (UserInterface* self) {
+static gboolean ___lambda21_ (UserInterface* self) {
 	gboolean result = FALSE;
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 2017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 2017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9843 "ui.c"
+#line 11007 "ui.c"
 }
 
 
-static gboolean ____lambda18__gsource_func (gpointer self) {
+static gboolean ____lambda21__gsource_func (gpointer self) {
 	gboolean result;
-	result = ___lambda18_ ((UserInterface*) self);
-#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = ___lambda21_ ((UserInterface*) self);
+#line 2148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9852 "ui.c"
+#line 11016 "ui.c"
 }
 
 
@@ -9882,97 +11049,97 @@ static void user_interface_book_saving_cb (UserInterface* self, gint page_number
 	ProgressBarDialog* _tmp12_ = NULL;
 	gdouble _tmp13_ = 0.0;
 	ProgressBarDialog* _tmp14_ = NULL;
-#line 2005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
-#line 9879 "ui.c"
+#line 11043 "ui.c"
 		gboolean _tmp0_ = FALSE;
-#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = gtk_events_pending ();
-#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!_tmp0_) {
-#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 9887 "ui.c"
+#line 11051 "ui.c"
 		}
-#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_main_iteration ();
-#line 9891 "ui.c"
+#line 11055 "ui.c"
 	}
-#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	total = (gint) _tmp3_;
-#line 2012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_number;
-#line 2012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = total;
-#line 2012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	fraction = (_tmp4_ + 1.0) / _tmp5_;
-#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = fraction;
-#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	complete = _tmp6_ == 1.0;
-#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = complete;
-#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_) {
-#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, ____lambda18__gsource_func, g_object_ref (self), g_object_unref);
-#line 9917 "ui.c"
+#line 2148 "/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 11081 "ui.c"
 	}
-#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("Saving page %d out of %d");
-#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = page_number;
-#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = total;
-#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = g_strdup_printf (_tmp8_, _tmp9_ + 1, _tmp10_);
-#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	message = _tmp11_;
-#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = self->priv->progress_dialog;
-#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = fraction;
-#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_set_fraction (_tmp12_, _tmp13_);
-#line 2022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = self->priv->progress_dialog;
-#line 2022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_set_message (_tmp14_, message);
-#line 2005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (message);
-#line 9941 "ui.c"
+#line 11105 "ui.c"
 }
 
 
 void user_interface_show_progress_dialog (UserInterface* self) {
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, TRUE);
-#line 9953 "ui.c"
+#line 11117 "ui.c"
 }
 
 
 void user_interface_hide_progress_dialog (UserInterface* self) {
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 9965 "ui.c"
+#line 11129 "ui.c"
 }
 
 
@@ -9982,87 +11149,87 @@ void user_interface_show_error (UserInterface* self, const gchar* error_title, c
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_title != NULL);
-#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_text != NULL);
-#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->have_error = TRUE;
-#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = error_title;
-#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_title);
-#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_title = _tmp1_;
-#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = error_text;
-#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_text);
-#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_text = _tmp3_;
-#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = change_scanner_hint;
-#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_change_scanner_hint = _tmp4_;
-#line 2041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_info_bar (self);
-#line 10005 "ui.c"
+#line 11169 "ui.c"
 }
 
 
 void user_interface_start (UserInterface* self) {
-#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) self, TRUE);
-#line 10014 "ui.c"
+#line 11178 "ui.c"
 }
 
 
 Book* user_interface_get_book (UserInterface* self) {
 	Book* result;
 	Book* _tmp0_ = NULL;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp0_;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10029 "ui.c"
+#line 11193 "ui.c"
 }
 
 
 static gpointer _book_ref0 (gpointer self) {
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? book_ref (self) : NULL;
-#line 10036 "ui.c"
+#line 11200 "ui.c"
 }
 
 
 static void user_interface_set_book (UserInterface* self, Book* value) {
 	Book* _tmp0_ = NULL;
 	Book* _tmp1_ = NULL;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = value;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _book_ref0 (_tmp0_);
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_book_unref0 (self->priv->_book);
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->_book = _tmp1_;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "book");
-#line 10055 "ui.c"
+#line 11219 "ui.c"
 }
 
 
@@ -10071,85 +11238,51 @@ Page* user_interface_get_selected_page (UserInterface* self) {
 	BookView* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, NULL);
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp2_;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10076 "ui.c"
+#line 11240 "ui.c"
 }
 
 
 void user_interface_set_selected_page (UserInterface* self, Page* value) {
 	BookView* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_view_set_selected_page (_tmp0_, _tmp1_);
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "selected-page");
-#line 10093 "ui.c"
-}
-
-
-const gchar* user_interface_get_default_file_name (UserInterface* self) {
-	const gchar* result;
-	const gchar* _tmp0_ = NULL;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->_default_file_name;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = _tmp0_;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 10108 "ui.c"
-}
-
-
-void user_interface_set_default_file_name (UserInterface* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (self != NULL);
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = value;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->_default_file_name);
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->_default_file_name = _tmp1_;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_notify ((GObject *) self, "default-file-name");
-#line 10127 "ui.c"
+#line 11257 "ui.c"
 }
 
 
 gboolean user_interface_get_scanning (UserInterface* self) {
 	gboolean result;
 	gboolean _tmp0_ = FALSE;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->scanning_;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp0_;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10142 "ui.c"
+#line 11272 "ui.c"
 }
 
 
@@ -10165,45 +11298,45 @@ void user_interface_set_scanning (UserInterface* self, gboolean value) {
 	gboolean _tmp8_ = FALSE;
 	GtkButton* _tmp9_ = NULL;
 	gboolean _tmp10_ = FALSE;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = value;
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->scanning_ = _tmp0_;
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->scanning_ = _tmp0_;
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->page_delete_menuitem;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = value;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_sensitive ((GtkWidget*) _tmp1_, !_tmp2_);
 #line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_sensitive ((GtkWidget*) _tmp1_, !_tmp2_);
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->stop_scan_menuitem;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = value;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, _tmp4_);
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, _tmp4_);
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->stop_toolbutton;
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = value;
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_sensitive ((GtkWidget*) _tmp5_, _tmp6_);
 #line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_sensitive ((GtkWidget*) _tmp5_, _tmp6_);
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = self->priv->scan_button;
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = value;
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_visible ((GtkWidget*) _tmp7_, !_tmp8_);
 #line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp7_, !_tmp8_);
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->stop_button;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = value;
-#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp9_, _tmp10_);
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "scanning");
-#line 10196 "ui.c"
+#line 11326 "ui.c"
 }
 
 
@@ -10212,36 +11345,36 @@ gint user_interface_get_brightness (UserInterface* self) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->brightness_adjustment;
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = (gint) _tmp2_;
-#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10217 "ui.c"
+#line 11347 "ui.c"
 }
 
 
 void user_interface_set_brightness (UserInterface* self, gint value) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gint _tmp1_ = 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_if_fail (self != NULL);
-#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_ = value;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "brightness");
-#line 10234 "ui.c"
+#line 11364 "ui.c"
 }
 
 
@@ -10250,36 +11383,36 @@ gint user_interface_get_contrast (UserInterface* self) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->contrast_adjustment;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = (gint) _tmp2_;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10255 "ui.c"
+#line 11385 "ui.c"
 }
 
 
 void user_interface_set_contrast (UserInterface* self, gint value) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gint _tmp1_ = 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_if_fail (self != NULL);
-#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_ = value;
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "contrast");
-#line 10272 "ui.c"
+#line 11402 "ui.c"
 }
 
 
@@ -10288,36 +11421,36 @@ gint user_interface_get_quality (UserInterface* self) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->quality_adjustment;
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = (gint) _tmp2_;
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10293 "ui.c"
+#line 11423 "ui.c"
 }
 
 
 void user_interface_set_quality (UserInterface* self, gint value) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gint _tmp1_ = 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_if_fail (self != NULL);
-#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_ = value;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "quality");
-#line 10310 "ui.c"
+#line 11440 "ui.c"
 }
 
 
@@ -10327,37 +11460,37 @@ gchar* user_interface_get_selected_device (UserInterface* self) {
 	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->device_combo;
-#line 234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 10330 "ui.c"
+#line 11460 "ui.c"
 		gchar* device = NULL;
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->device_model;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &device, -1, -1);
 #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"
 		result = device;
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10344 "ui.c"
+#line 11474 "ui.c"
 	}
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = NULL;
-#line 241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10350 "ui.c"
+#line 11480 "ui.c"
 }
 
 
@@ -10368,31 +11501,31 @@ void user_interface_set_selected_device (UserInterface* self, const gchar* value
 	gboolean _tmp2_ = FALSE;
 	GtkComboBox* _tmp3_ = NULL;
 	GtkTreeIter _tmp4_ = {0};
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = value;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_find_scan_device (self, _tmp0_, &_tmp1_);
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp2_) {
 #line 248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (!_tmp2_) {
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 10373 "ui.c"
+#line 11503 "ui.c"
 	}
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->device_combo;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = iter;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_combo_box_set_active_iter (_tmp3_, &_tmp4_);
 #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"
 	self->priv->user_selected_device = TRUE;
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "selected-device");
-#line 10385 "ui.c"
+#line 11515 "ui.c"
 }
 
 
@@ -10400,17 +11533,17 @@ static gchar* user_interface_get_state_filename (UserInterface* self) {
 	gchar* result;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_get_user_cache_dir ();
-#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_build_filename (_tmp0_, "simple-scan", "state", NULL);
-#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp1_;
-#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10403 "ui.c"
+#line 11533 "ui.c"
 }
 
 
@@ -10429,19 +11562,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 10422 "ui.c"
+#line 11552 "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 10428 "ui.c"
+#line 11558 "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 10434 "ui.c"
+#line 11564 "ui.c"
 }
 
 
@@ -10460,19 +11593,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 10453 "ui.c"
+#line 11583 "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 10459 "ui.c"
+#line 11589 "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 10465 "ui.c"
+#line 11595 "ui.c"
 }
 
 
@@ -10493,8 +11626,6 @@ static void user_interface_class_init (UserInterfaceClass * klass) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_SELECTED_PAGE, param_spec_page ("selected-page", "selected-page", "selected-page", TYPE_PAGE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_DEFAULT_FILE_NAME, g_param_spec_string ("default-file-name", "default-file-name", "default-file-name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_SCANNING, g_param_spec_boolean ("scanning", "scanning", "scanning", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_BRIGHTNESS, g_param_spec_int ("brightness", "brightness", "brightness", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
@@ -10698,33 +11829,27 @@ static void user_interface_class_init (UserInterfaceClass * klass) {
 	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 10691 "ui.c"
+#line 11819 "ui.c"
 }
 
 
 static void user_interface_instance_init (UserInterface * self) {
 	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = USER_INTERFACE_GET_PRIVATE (self);
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->missing_driver = NULL;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->book_uri = NULL;
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = g_strdup ("photo");
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->document_hint = _tmp0_;
 #line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = _ ("Scanned Document.pdf");
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp0_ = g_strdup ("photo");
 #line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->_default_file_name = _tmp2_;
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->document_hint = _tmp0_;
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->scanning_ = FALSE;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_init_template (GTK_WIDGET (self));
-#line 10717 "ui.c"
+#line 11839 "ui.c"
 }
 
 
@@ -10738,23 +11863,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 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp1_, NULL, FALSE);
-#line 286 "/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 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"
 	_tmp2_ = 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 ("reordered", TYPE_BOOK, &_tmp3_, NULL, FALSE);
-#line 287 "/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 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"
 	_tmp4_ = 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 ("page-removed", TYPE_BOOK, &_tmp5_, NULL, FALSE);
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 289 "/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);
@@ -10776,129 +11901,131 @@ static void user_interface_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->info_bar_close_button);
 #line 47 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_change_scanner_button);
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->info_bar_install_button);
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->custom_crop_menuitem);
-#line 51 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 52 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->a4_menuitem);
-#line 53 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->a5_menuitem);
-#line 55 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->a6_menuitem);
-#line 57 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 58 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->letter_menuitem);
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 60 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->legal_menuitem);
-#line 61 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->four_by_six_menuitem);
-#line 63 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->no_crop_menuitem);
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_move_left_menuitem);
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_move_right_menuitem);
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_delete_menuitem);
-#line 71 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->crop_rotate_menuitem);
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_menuitem);
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_as_menuitem);
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->copy_to_clipboard_menuitem);
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_button);
-#line 81 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_toolbutton);
-#line 83 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 84 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->stop_scan_menuitem);
-#line 85 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->stop_toolbutton);
-#line 87 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->crop_button);
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->crop_toolbutton);
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->stop_button);
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->scan_button);
-#line 96 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_button_menuitem);
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_button_hb_menuitem);
-#line 100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_menuitem);
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_button_menuitem);
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_button_hb_menuitem);
-#line 106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_menuitem);
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->authorize_dialog);
-#line 111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->authorize_label);
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->username_entry);
-#line 115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->password_entry);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->preferences_dialog);
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->device_combo);
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_dpi_combo);
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_dpi_combo);
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_side_combo);
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->paper_size_combo);
-#line 130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->brightness_scale);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->contrast_scale);
-#line 134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->quality_scale);
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->device_model);
-#line 138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_dpi_model);
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_dpi_model);
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_side_model);
-#line 144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->paper_size_model);
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->brightness_adjustment);
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->contrast_adjustment);
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->quality_adjustment);
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (self->priv->missing_driver);
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_dialog);
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_title);
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_text);
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_book_unref0 (self->priv->_book);
-#line 163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
-#line 177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_autosave_manager_unref0 (self->priv->autosave_manager);
 #line 179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_autosave_manager_unref0 (self->priv->autosave_manager);
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->book_view);
-#line 186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->document_hint);
 #line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (self->priv->_default_file_name);
+	_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 10891 "ui.c"
+#line 12015 "ui.c"
 }
 
 
@@ -10932,12 +12059,6 @@ static void _vala_user_interface_get_property (GObject * object, guint property_
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case USER_INTERFACE_DEFAULT_FILE_NAME:
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_value_set_string (value, user_interface_get_default_file_name (self));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case USER_INTERFACE_SCANNING:
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_boolean (value, user_interface_get_scanning (self));
@@ -10967,13 +12088,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 10960 "ui.c"
+#line 12078 "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 10966 "ui.c"
+#line 12084 "ui.c"
 	}
 }
 
@@ -10996,12 +12117,6 @@ static void _vala_user_interface_set_property (GObject * object, guint property_
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		case USER_INTERFACE_DEFAULT_FILE_NAME:
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_default_file_name (self, g_value_get_string (value));
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		break;
-#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case USER_INTERFACE_SCANNING:
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_scanning (self, g_value_get_boolean (value));
@@ -11031,13 +12146,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 11024 "ui.c"
+#line 12136 "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 11030 "ui.c"
+#line 12142 "ui.c"
 	}
 }
 
@@ -11056,92 +12171,92 @@ ProgressBarDialog* progress_bar_dialog_construct (GType object_type, GtkApplicat
 	const gchar* _tmp7_ = NULL;
 	GtkApplicationWindow* _tmp8_ = NULL;
 	GtkProgressBar* _tmp9_ = NULL;
-#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (parent != NULL, NULL);
-#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (ProgressBarDialog*) g_object_new (object_type, NULL);
-#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
-#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->bar = _tmp0_;
-#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp1_);
-#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2202 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	hbox = _tmp1_;
-#line 2070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-#line 2070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp2_);
-#line 2070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	vbox = _tmp2_;
-#line 2071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_hexpand ((GtkWidget*) hbox, TRUE);
-#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->bar;
-#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp3_, "");
-#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->bar;
-#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_show_text (_tmp4_, TRUE);
-#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->bar;
-#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) _tmp5_, 225, 25);
-#line 2076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) self, 250, 50);
-#line 2078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->bar;
-#line 2078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) _tmp6_, TRUE, FALSE, (guint) 0);
-#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (hbox, (GtkWidget*) vbox, TRUE, FALSE, (guint) 0);
-#line 2080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) self, (GtkWidget*) hbox);
-#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = title;
-#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_title ((GtkWindow*) self, _tmp7_);
-#line 2083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = parent;
-#line 2083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_transient_for ((GtkWindow*) self, (GtkWindow*) _tmp8_);
-#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_position ((GtkWindow*) self, GTK_WIN_POS_CENTER_ON_PARENT);
-#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_modal ((GtkWindow*) self, TRUE);
-#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_resizable ((GtkWindow*) self, FALSE);
-#line 2088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) hbox, TRUE);
-#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) vbox, TRUE);
-#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->bar;
-#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp9_, TRUE);
-#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (vbox);
-#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
-#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 11127 "ui.c"
+#line 12239 "ui.c"
 }
 
 
 ProgressBarDialog* progress_bar_dialog_new (GtkApplicationWindow* parent, const gchar* title) {
-#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return progress_bar_dialog_construct (TYPE_PROGRESS_BAR_DIALOG, parent, title);
-#line 11134 "ui.c"
+#line 12246 "ui.c"
 }
 
 
@@ -11150,36 +12265,36 @@ gdouble progress_bar_dialog_get_fraction (ProgressBarDialog* self) {
 	GtkProgressBar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0.0);
-#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_progress_bar_get_fraction (_tmp0_);
-#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp2_;
-#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11155 "ui.c"
+#line 12267 "ui.c"
 }
 
 
 void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble value) {
 	GtkProgressBar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_fraction (_tmp0_, _tmp1_);
-#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "fraction");
-#line 11172 "ui.c"
+#line 12284 "ui.c"
 }
 
 
@@ -11188,74 +12303,74 @@ const gchar* progress_bar_dialog_get_message (ProgressBarDialog* self) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_progress_bar_get_text (_tmp0_);
-#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp2_;
-#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11193 "ui.c"
+#line 12305 "ui.c"
 }
 
 
 void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* value) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "message");
-#line 11210 "ui.c"
+#line 12322 "ui.c"
 }
 
 
 static void progress_bar_dialog_class_init (ProgressBarDialogClass * klass) {
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (ProgressBarDialogPrivate));
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_progress_bar_dialog_get_property;
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_progress_bar_dialog_set_property;
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->finalize = progress_bar_dialog_finalize;
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/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 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/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 11229 "ui.c"
+#line 12341 "ui.c"
 }
 
 
 static void progress_bar_dialog_instance_init (ProgressBarDialog * self) {
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = PROGRESS_BAR_DIALOG_GET_PRIVATE (self);
-#line 11236 "ui.c"
+#line 12348 "ui.c"
 }
 
 
 static void progress_bar_dialog_finalize (GObject* obj) {
 	ProgressBarDialog * self;
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
-#line 2052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (progress_bar_dialog_parent_class)->finalize (obj);
-#line 11248 "ui.c"
+#line 12360 "ui.c"
 }
 
 
@@ -11274,27 +12389,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 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (property_id) {
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_FRACTION:
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_double (value, progress_bar_dialog_get_fraction (self));
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_MESSAGE:
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_string (value, progress_bar_dialog_get_message (self));
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 11281 "ui.c"
+#line 12393 "ui.c"
 		default:
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 11287 "ui.c"
+#line 12399 "ui.c"
 	}
 }
 
@@ -11302,27 +12417,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 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (property_id) {
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_FRACTION:
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		progress_bar_dialog_set_fraction (self, g_value_get_double (value));
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_MESSAGE:
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		progress_bar_dialog_set_message (self, g_value_get_string (value));
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 11309 "ui.c"
+#line 12421 "ui.c"
 		default:
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 11315 "ui.c"
+#line 12427 "ui.c"
 	}
 }
 
@@ -11335,96 +12450,96 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
 	gchar* _tmp2_ = NULL;
 	gchar* path = NULL;
 	GError * _inner_error_ = NULL;
-#line 2095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (prefix != NULL, NULL);
-#line 2095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (extension != NULL, NULL);
-#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = prefix;
-#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = extension;
-#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_);
-#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp2_;
-#line 11340 "ui.c"
+#line 12452 "ui.c"
 	{
 		gint fd = 0;
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = filename;
-#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_file_open_tmp (_tmp3_, &_tmp4_, &_inner_error_);
-#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		path = _tmp4_;
-#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		fd = _tmp5_;
-#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11359 "ui.c"
-			goto __catch26_g_error;
+#line 12471 "ui.c"
+			goto __catch28_g_error;
 		}
-#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = fd;
-#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		close (_tmp6_);
-#line 11366 "ui.c"
+#line 12478 "ui.c"
 	}
-	goto __finally26;
-	__catch26_g_error:
+	goto __finally28;
+	__catch28_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = e;
-#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_->message;
-#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:2109: Error saving email attachment: %s", _tmp8_);
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:2242: Error saving email attachment: %s", _tmp8_);
+#line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = NULL;
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 11394 "ui.c"
+#line 12506 "ui.c"
 	}
-	__finally26:
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally28:
+#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2235 "/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 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return NULL;
-#line 11409 "ui.c"
+#line 12521 "ui.c"
 	}
-#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = path;
-#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11417 "ui.c"
+#line 12529 "ui.c"
 }
 
 
@@ -11435,40 +12550,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 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (text != NULL, NULL);
-#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) g_object_new (object_type, NULL);
-#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = text;
-#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->text);
-#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->text = _tmp1_;
-#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = r;
-#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->r = _tmp2_;
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g;
-#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->g = _tmp3_;
-#line 2129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = b;
-#line 2129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->b = _tmp4_;
-#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 11454 "ui.c"
+#line 12566 "ui.c"
 }
 
 
 PageIcon* page_icon_new (const gchar* text, gdouble r, gdouble g, gdouble b) {
-#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return page_icon_construct (TYPE_PAGE_ICON, text, r, g, b);
-#line 11461 "ui.c"
+#line 12573 "ui.c"
 }
 
 
@@ -11476,23 +12591,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 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_width = PAGE_ICON_MINIMUM_WIDTH;
-#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_width = _vala_natural_width;
-#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_width) {
-#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_width = _vala_minimum_width;
-#line 11479 "ui.c"
+#line 12591 "ui.c"
 	}
-#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_width) {
-#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_width = _vala_natural_width;
-#line 11485 "ui.c"
+#line 12597 "ui.c"
 	}
 }
 
@@ -11502,25 +12617,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 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = round (PAGE_ICON_MINIMUM_WIDTH * G_SQRT2);
-#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_height = (gint) _tmp0_;
-#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_height = _vala_natural_height;
-#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_height) {
-#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_height = _vala_minimum_height;
-#line 11507 "ui.c"
+#line 12619 "ui.c"
 	}
-#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_height) {
-#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_height = _vala_natural_height;
-#line 11513 "ui.c"
+#line 12625 "ui.c"
 	}
 }
 
@@ -11530,25 +12645,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 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = width;
-#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_height = (gint) (_tmp0_ * G_SQRT2);
-#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_height = _vala_natural_height;
-#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_height) {
-#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_height = _vala_minimum_height;
-#line 11535 "ui.c"
+#line 12647 "ui.c"
 	}
-#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_height) {
-#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_height = _vala_natural_height;
-#line 11541 "ui.c"
+#line 12653 "ui.c"
 	}
 }
 
@@ -11558,25 +12673,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 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = height;
-#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_width = (gint) (_tmp0_ / G_SQRT2);
-#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_width = _vala_natural_width;
-#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_width) {
-#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_width = _vala_minimum_width;
-#line 11563 "ui.c"
+#line 12675 "ui.c"
 	}
-#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_width) {
-#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_width = _vala_natural_width;
-#line 11569 "ui.c"
+#line 12681 "ui.c"
 	}
 }
 
@@ -11619,166 +12734,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 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (c != NULL, FALSE);
-#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_widget_get_allocated_width ((GtkWidget*) self);
-#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	w = _tmp0_;
-#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_widget_get_allocated_height ((GtkWidget*) self);
-#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	h = _tmp1_;
-#line 2156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = w;
-#line 2156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = h;
-#line 2156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((_tmp2_ * G_SQRT2) > ((gdouble) _tmp3_)) {
-#line 11630 "ui.c"
+#line 12742 "ui.c"
 		gint _tmp4_ = 0;
 		gdouble _tmp5_ = 0.0;
-#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = h;
-#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = round (_tmp4_ / G_SQRT2);
-#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		w = (gint) _tmp5_;
-#line 11639 "ui.c"
+#line 12751 "ui.c"
 	} else {
 		gint _tmp6_ = 0;
 		gdouble _tmp7_ = 0.0;
-#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = w;
-#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = round (_tmp6_ * G_SQRT2);
-#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		h = (gint) _tmp7_;
-#line 11649 "ui.c"
+#line 12761 "ui.c"
 	}
-#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = c;
-#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = gtk_widget_get_allocated_width ((GtkWidget*) self);
-#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = w;
-#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = gtk_widget_get_allocated_height ((GtkWidget*) self);
-#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = h;
-#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_translate (_tmp8_, (gdouble) ((_tmp9_ - _tmp10_) / 2), (gdouble) ((_tmp11_ - _tmp12_) / 2));
-#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = c;
-#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = w;
-#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = h;
-#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_rectangle (_tmp13_, 0.5, 0.5, (gdouble) (_tmp14_ - 1), (gdouble) (_tmp15_ - 1));
-#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = c;
-#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->r;
-#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = self->priv->g;
-#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = self->priv->b;
-#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_source_rgb (_tmp16_, _tmp17_, _tmp18_, _tmp19_);
-#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = c;
-#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_fill_preserve (_tmp20_);
-#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = c;
-#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_line_width (_tmp21_, 1.0);
-#line 2169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = c;
-#line 2169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_source_rgb (_tmp22_, 0.0, 0.0, 0.0);
-#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = c;
-#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_stroke (_tmp23_);
-#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = c;
-#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = self->priv->text;
-#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_text_extents (_tmp24_, _tmp25_, &_tmp26_);
-#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extents = _tmp26_;
-#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = c;
-#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = w;
-#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = extents;
-#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = _tmp29_.width;
-#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = h;
-#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = extents;
-#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = _tmp32_.height;
-#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2307 "/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 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp34_ = c;
-#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = self->priv->text;
-#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_show_text (_tmp34_, _tmp35_);
-#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 11731 "ui.c"
+#line 12843 "ui.c"
 }
 
 
 static void page_icon_class_init (PageIconClass * klass) {
-#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_icon_parent_class = g_type_class_peek_parent (klass);
-#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (PageIconPrivate));
-#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->get_preferred_width = page_icon_real_get_preferred_width;
-#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->get_preferred_height = page_icon_real_get_preferred_height;
-#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2249 "/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 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2249 "/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 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->draw = page_icon_real_draw;
-#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_icon_finalize;
-#line 11752 "ui.c"
+#line 12864 "ui.c"
 }
 
 
 static void page_icon_instance_init (PageIcon * self) {
-#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = PAGE_ICON_GET_PRIVATE (self);
-#line 11759 "ui.c"
+#line 12871 "ui.c"
 }
 
 
 static void page_icon_finalize (GObject* obj) {
 	PageIcon * self;
-#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_ICON, PageIcon);
-#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->text);
-#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2249 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (page_icon_parent_class)->finalize (obj);
-#line 11771 "ui.c"
+#line 12883 "ui.c"
 }
 
 
diff --git a/src/ui.vala b/src/ui.vala
index 362c53b..17392bc 100644
--- a/src/ui.vala
+++ b/src/ui.vala
@@ -45,6 +45,7 @@ public class UserInterface : Gtk.ApplicationWindow
     private Gtk.Label info_bar_label;
     private Gtk.Button info_bar_close_button;
     private Gtk.Button info_bar_change_scanner_button;
+    private Gtk.Button info_bar_install_button;
     [GtkChild]
     private Gtk.RadioMenuItem custom_crop_menuitem;
     [GtkChild]
@@ -149,6 +150,7 @@ public class UserInterface : Gtk.ApplicationWindow
     [GtkChild]
     private Gtk.Adjustment quality_adjustment;
     private bool setting_devices;
+    private string? missing_driver = null;
     private bool user_selected_device;
 
     private Gtk.FileChooserDialog? save_dialog;
@@ -185,7 +187,6 @@ public class UserInterface : Gtk.ApplicationWindow
 
     private string document_hint = "photo";
 
-    public string default_file_name { get; set; default = _("Scanned Document.pdf"); }
     private bool scanning_ = false;
     public bool scanning
     {
@@ -315,6 +316,7 @@ public class UserInterface : Gtk.ApplicationWindow
                                             "%s", error_title);
         dialog.add_button (_("_Close"), 0);
         dialog.format_secondary_text ("%s", error_text);
+        dialog.run ();
         dialog.destroy ();
     }
 
@@ -350,6 +352,7 @@ public class UserInterface : Gtk.ApplicationWindow
         Gtk.MessageType type;
         string title, text, image_id;
         bool show_close_button = false;
+        bool show_install_button = false;
         bool show_change_scanner_button = false;
 
         if (have_error)
@@ -365,10 +368,21 @@ public class UserInterface : Gtk.ApplicationWindow
         {
             type = Gtk.MessageType.WARNING;
             image_id = "dialog-warning";
-            /* Warning displayed when no scanners are detected */
-            title = _("No scanners detected");
-            /* Hint to user on why there are no scanners detected */
-            text = _("Please check your scanner is connected and powered on");
+            if (missing_driver == null)
+            {
+                /* Warning displayed when no scanners are detected */
+                title = _("No scanners detected");
+                /* Hint to user on why there are no scanners detected */
+                text = _("Please check your scanner is connected and powered on");
+            }
+            else
+            {
+                /* Warning displayed when no drivers are installed but a compatible scanner is detected */
+                title = _("Additional software needed");
+                /* Instructions to install driver software */
+                text = _("You need to install driver software for your scanner.");
+                show_install_button = true;
+            }
         }
         else
         {
@@ -382,10 +396,11 @@ public class UserInterface : Gtk.ApplicationWindow
         info_bar_label.set_markup (message);
         info_bar_close_button.visible = show_close_button;
         info_bar_change_scanner_button.visible = show_change_scanner_button;
+        info_bar_install_button.visible = show_install_button;
         info_bar.visible = true;
     }
 
-    public void set_scan_devices (List<ScanDevice> devices)
+    public void set_scan_devices (List<ScanDevice> devices, string? missing_driver = null)
     {
         bool have_selection = false;
         int index;
@@ -393,6 +408,8 @@ public class UserInterface : Gtk.ApplicationWindow
 
         setting_devices = true;
 
+        this.missing_driver = missing_driver;
+
         /* If the user hasn't chosen a scanner choose the best available one */
         if (user_selected_device)
             have_selection = device_combo.active >= 0;
@@ -469,31 +486,6 @@ public class UserInterface : Gtk.ApplicationWindow
         book_view.selected_page = page;
     }
 
-    private void on_file_type_changed (Gtk.TreeSelection selection)
-    {
-        var extension = get_selected_extension (selection);
-        var path = save_dialog.get_filename ();
-        var filename = Path.get_basename (path);
-
-        /* Replace extension */
-        var extension_index = filename.last_index_of_char ('.');
-        if (extension_index >= 0)
-            filename = filename.slice (0, extension_index);
-        filename = filename + extension;
-        save_dialog.set_current_name (filename);
-    }
-
-    private string get_selected_extension (Gtk.TreeSelection selection)
-    {
-        Gtk.TreeModel model;
-        Gtk.TreeIter iter;
-        string extension = "";
-
-        if (selection.get_selected (out model, out iter))
-            model.get (iter, 1, out extension, -1);
-        return extension;
-    }
-
     private string choose_file_location ()
     {
         /* Get directory to save to */
@@ -513,7 +505,8 @@ public class UserInterface : Gtk.ApplicationWindow
         save_dialog.do_overwrite_confirmation = true;
         save_dialog.local_only = false;
         save_dialog.set_current_folder (directory);
-        save_dialog.set_current_name (default_file_name);
+        /* Default filename to use when saving document */
+        save_dialog.set_current_name (_("Scanned Document.pdf"));
 
         /* Filter to only show images by default */
         var filter = new Gtk.FileFilter ();
@@ -528,16 +521,6 @@ public class UserInterface : Gtk.ApplicationWindow
         filter.add_pattern ("*");
         save_dialog.add_filter (filter);
 
-        var expander = new Gtk.Expander.with_mnemonic (/* */
-                                                       _("Select File _Type"));
-        expander.spacing = 5;
-        save_dialog.set_extra_widget (expander);
-
-        string default_extension = "";
-        var index = default_file_name.last_index_of_char ('.');
-        if (index >= 0)
-            default_extension = default_file_name.substring (index);
-
         var file_type_store = new Gtk.ListStore (2, typeof (string), typeof (string));
         Gtk.TreeIter iter;
         file_type_store.append (out iter);
@@ -559,40 +542,54 @@ public class UserInterface : Gtk.ApplicationWindow
                              1, ".png",
                              -1);
 
-        var file_type_view = new Gtk.TreeView.with_model (file_type_store);
-        file_type_view.headers_visible = false;
-        file_type_view.rules_hint = true;
-        var column = new Gtk.TreeViewColumn.with_attributes ("",
-                                                             new Gtk.CellRendererText (),
-                                                             "text", 0, null);
-        file_type_view.append_column (column);
-        expander.add (file_type_view);
+        var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+        box.visible = true;
+        save_dialog.set_extra_widget (box);
+
+        /* Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG) */
+        var label = new Gtk.Label (_("File format:"));
+        label.visible = true;
+        box.pack_start (label, false, false, 0);
+
+        var file_type_combo = new Gtk.ComboBox.with_model (file_type_store);
+        file_type_combo.visible = true;
+        var renderer = new Gtk.CellRendererText ();
+        file_type_combo.pack_start (renderer, true);
+        file_type_combo.add_attribute (renderer, "text", 0);
 
-        if (file_type_store.get_iter_first (out iter))
+        file_type_combo.set_active (0);
+        file_type_combo.changed.connect (() =>
         {
-            do
-            {
-                string e;
-                file_type_store.get (iter, 1, out e, -1);
-                if (default_extension == e)
-                    file_type_view.get_selection ().select_iter (iter);
-            } while (file_type_store.iter_next (ref iter));
-        }
-        file_type_view.get_selection ().changed.connect (on_file_type_changed);
+            var extension = "";
+            Gtk.TreeIter i;
+            if (file_type_combo.get_active_iter (out i))
+                file_type_store.get (i, 1, out extension, -1);
 
-        expander.show_all ();
+            var path = save_dialog.get_filename ();
+            var filename = Path.get_basename (path);
+
+            /* Replace extension */
+            var extension_index = filename.last_index_of_char ('.');
+            if (extension_index >= 0)
+                filename = filename.slice (0, extension_index);
+            filename = filename + extension;
+            save_dialog.set_current_name (filename);
+        });
+        box.pack_start (file_type_combo, false, false, 0);
 
         var response = save_dialog.run ();
 
         string? uri = null;
         if (response == Gtk.ResponseType.ACCEPT)
         {
-            var selection = file_type_view.get_selection ();
-            var extension = get_selected_extension (selection);
+            var extension = "";
+            Gtk.TreeIter i;
+            if (file_type_combo.get_active_iter (out i))
+                file_type_store.get (i, 1, out extension, -1);
 
             var path = save_dialog.get_filename ();
             var filename = Path.get_basename (path);
-            
+
             var extension_index = filename.last_index_of_char ('.');
             if (extension_index < 0)
                 path += extension;
@@ -602,7 +599,6 @@ public class UserInterface : Gtk.ApplicationWindow
 
         settings.set_string ("save-directory", save_dialog.get_current_folder ());
 
-        file_type_view.get_selection ().changed.disconnect (on_file_type_changed);
         save_dialog.destroy ();
         save_dialog = null;
 
@@ -968,7 +964,7 @@ public class UserInterface : Gtk.ApplicationWindow
         menuitem.active = true;
         crop_button.active = page.has_crop;
         crop_toolbutton.active = page.has_crop;
-        
+
         updating_page_menu = false;
     }
 
@@ -1082,7 +1078,7 @@ public class UserInterface : Gtk.ApplicationWindow
         else
             no_crop_menuitem.active = true;
     }
-    
+
     [GtkCallback]
     private void crop_toolbutton_toggled_cb (Gtk.ToggleToolButton widget)
     {
@@ -1223,7 +1219,7 @@ public class UserInterface : Gtk.ApplicationWindow
         b = make_reorder_button (_("Reverse"), "C1C2C3C4C5C6-C6C5C4C3C2C1");
         b.clicked.connect (() =>
         {
-            book.reverse ();           
+            book.reverse ();
             dialog.destroy ();
         });
         b.visible = true;
@@ -1255,7 +1251,7 @@ public class UserInterface : Gtk.ApplicationWindow
     private Gtk.Button make_reorder_button (string text, string items)
     {
         var b = new Gtk.Button ();
-        
+
         var vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
         vbox.visible = true;
         b.add (vbox);
@@ -1406,7 +1402,7 @@ public class UserInterface : Gtk.ApplicationWindow
     {
         email (document_hint, quality);
     }
-    
+
     private void print_document ()
     {
         var print = new Gtk.PrintOperation ();
@@ -1544,20 +1540,155 @@ public class UserInterface : Gtk.ApplicationWindow
 
     private void info_bar_response_cb (Gtk.InfoBar widget, int response_id)
     {
-        if (response_id == 1)
+        switch (response_id)
         {
+        /* Change scanner */
+        case 1:
             device_combo.grab_focus ();
             preferences_dialog.present ();
-        }
-        else
-        {
+            break;
+        /* Install drivers */
+        case 2:
+            install_drivers ();
+            break;
+        default:
             have_error = false;
             error_title = null;
             error_text = null;
             update_info_bar ();
+            break;
         }
     }
 
+    private void install_drivers ()
+    {
+        var message = "", instructions = "";
+        string[] packages_to_install = {};
+        switch (missing_driver)
+        {
+        case "brscan":
+        case "brscan2":
+        case "brscan3":
+        case "brscan4":
+            /* Message to indicate a Brother scanner has been detected */
+            message = _("You appear to have a Brother scanner.");
+            /* Instructions on how to install Brother scanner drivers */
+            instructions = _("Drivers for this are available on the <a href=\"http://support.brother.com\">Brother website</a>.");
+            break;
+        case "samsung":
+            /* Message to indicate a Samsung scanner has been detected */
+            message = _("You appear to have a Samsung scanner.");
+            /* Instructions on how to install Samsung scanner drivers */
+            instructions = _("Drivers for this are available on the <a href=\"http://samsung.com/support\">Samsung website</a>.");
+            break;
+        case "hpaio":
+            /* Message to indicate a HP scanner has been detected */
+            message = _("You appear to have an HP scanner.");
+            packages_to_install = { "libsane-hpaio" };
+            break;
+        case "epkowa":
+            /* Message to indicate an Epson scanner has been detected */
+            message = _("You appear to have an Epson scanner.");
+            /* Instructions on how to install Epson scanner drivers */
+            instructions = _("Drivers for this are available on the <a href=\"http://support.epsom.com\">Epson website</a>.");
+            break;
+        }
+        var dialog = new Gtk.Dialog.with_buttons (/* Title of dialog giving instructions on how to install drivers */
+                                                  _("Install drivers"), this, Gtk.DialogFlags.MODAL, _("_Close"), Gtk.ResponseType.CLOSE);
+        dialog.get_content_area ().border_width = 12;
+        dialog.get_content_area ().spacing = 6;
+
+        var label = new Gtk.Label (message);
+        label.visible = true;
+        label.xalign = 0f;
+        dialog.get_content_area ().pack_start (label, true, true, 0);
+
+        var instructions_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+        instructions_box.visible = true;
+        dialog.get_content_area ().pack_start (instructions_box, true, true, 0);
+        
+        var stack = new Gtk.Stack ();
+        instructions_box.pack_start (stack, false, false, 0);
+
+        var spinner = new Gtk.Spinner ();
+        spinner.visible = true;
+        stack.add (spinner);
+
+        var status_label = new Gtk.Label ("");
+        status_label.visible = true;
+        stack.add (status_label);
+
+        var instructions_label = new Gtk.Label (instructions);
+        instructions_label.visible = true;
+        instructions_label.xalign = 0f;        
+        instructions_label.use_markup = true;
+        instructions_box.pack_start (instructions_label, false, false, 0);
+
+        label = new Gtk.Label (/* Message in driver install dialog */
+                               _("Once installed you will need to restart Simple Scan."));
+        label.visible = true;
+        label.xalign = 0f;        
+        dialog.get_content_area ().border_width = 12;
+        dialog.get_content_area ().pack_start (label, true, true, 0);
+
+        if (packages_to_install.length > 0)
+        {
+            stack.visible = true;
+            spinner.active = true;
+            instructions_label.set_text (/* Label shown while installing drivers */
+                                         _("Installing drivers..."));
+            install_packages.begin (packages_to_install, () => {}, (object, result) =>
+            {
+                status_label.visible = true;
+                spinner.active = false;
+                status_label.set_text ("☒");
+                stack.visible_child = status_label;
+                /* Label shown once drivers successfully installed */
+                var result_text = _("Drivers installed successfully!");
+                try
+                {
+                    var results = install_packages.end (result);
+                    if (results.get_error_code () == null)
+                        status_label.set_text ("☑");
+                    else
+                    {
+                        var e = results.get_error_code ();
+                        /* Label shown if failed to install drivers */
+                        var error_text = _("Failed to install drivers (error code %d).").printf (e.code);
+                    }
+
+                }
+                catch (Error e)
+                {
+                    /* Label shown if failed to install drivers */
+                    error_text = _("Failed to install drivers.");
+                    warning ("Failed to install drivers: %s", e.message);
+                }
+                instructions_label.set_text (result_text);
+            });
+        }
+
+        dialog.run ();
+        dialog.destroy ();
+    }
+
+    private async Pk.Results? install_packages (string[] packages, Pk.ProgressCallback progress_callback) throws GLib.Error
+    {
+        var task = new Pk.Task ();
+        Pk.Results results;
+        results = yield task.resolve_async (Pk.Filter.NOT_INSTALLED, packages, null, progress_callback);
+        if (results == null || results.get_error_code () != null)
+            return results;
+
+        var package_array = results.get_package_array ();
+        var package_ids = new string[package_array.length + 1];
+        package_ids[package_array.length] = null;
+        for (var i = 0; i < package_array.length; i++)
+            package_ids[i] = package_array.data[i].get_id ();
+
+        return yield task.install_packages_async (package_ids, null, progress_callback);
+    }
+
     [GtkCallback]
     private bool simple_scan_window_window_state_event_cb (Gtk.Widget widget, Gdk.EventWindowState event)
     {
@@ -1735,6 +1866,8 @@ public class UserInterface : Gtk.ApplicationWindow
         info_bar_close_button = info_bar.add_button (_("_Close"), Gtk.ResponseType.CLOSE) as Gtk.Button;
         info_bar_change_scanner_button = info_bar.add_button (/* Button in error infobar to open preferences dialog and change scanner */
                                                               _("Change _Scanner"), 1) as Gtk.Button;
+        info_bar_install_button = info_bar.add_button (/* Button in error infobar to prompt user to install drivers */
+                                                       _("_Install Drivers"), 2) as Gtk.Button;
 
         Gtk.TreeIter iter;
         paper_size_model.append (out iter);
@@ -2050,7 +2183,7 @@ public class UserInterface : Gtk.ApplicationWindow
 private class ProgressBarDialog : Gtk.Window
 {
     private Gtk.ProgressBar bar;
-    
+
     public double fraction
     {
         get { return bar.fraction; }