Merge tag 'upstream/3.13.4.2'

Upstream version 3.13.4.2

1 files changed, 1207 insertions, 1242 deletions

diff --git a/src/autosave-manager.c b/src/autosave-manager.c
index 3cb458a..de3f9ca 100644
--- a/src/autosave-manager.c
+++ b/src/autosave-manager.c
@@ -1,4 +1,4 @@
-/* autosave-manager.c generated by valac 0.22.1, the Vala compiler
+/* autosave-manager.c generated by valac 0.24.0, the Vala compiler
  * generated from autosave-manager.vala, do not modify */
 
 /*
@@ -150,9 +150,9 @@ void autosave_manager_on_page_removed (AutosaveManager* self, Page* page);
 static void autosave_manager_save_pixels (AutosaveManager* self, Page* page);
 static void autosave_manager_save (AutosaveManager* self, gboolean do_timeout);
 void autosave_manager_on_cleared (AutosaveManager* self);
-static gboolean ___lambda2_ (AutosaveManager* self);
+static gboolean ___lambda3_ (AutosaveManager* self);
 static void autosave_manager_real_save (AutosaveManager* self);
-static gboolean ____lambda2__gsource_func (gpointer self);
+static gboolean ____lambda3__gsource_func (gpointer self);
 guint book_get_n_pages (Book* self);
 Page* book_get_page (Book* self, gint page_number);
 gboolean page_get_has_data (Page* self);
@@ -227,7 +227,7 @@ AutosaveManager* autosave_manager_new (void) {
 
 
 static gpointer _page_ref0 (gpointer self) {
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return self ? page_ref (self) : NULL;
 #line 233 "autosave-manager.c"
 }
@@ -240,11 +240,11 @@ void autosave_manager_load (AutosaveManager* self) {
 	GKeyFile* file = NULL;
 	GKeyFile* _tmp3_ = NULL;
 	gchar* pages = NULL;
-	GKeyFile* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar** _tmp9_ = NULL;
-	gchar** _tmp10_ = NULL;
+	GKeyFile* _tmp9_ = NULL;
+	gchar* _tmp10_ = NULL;
+	const gchar* _tmp11_ = NULL;
+	gchar** _tmp12_ = NULL;
+	gchar** _tmp13_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
@@ -277,29 +277,43 @@ void autosave_manager_load (AutosaveManager* self) {
 #line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (_inner_error_ != NULL) {
 #line 280 "autosave-manager.c"
-			goto __catch28_g_error;
+			goto __catch27_g_error;
 		}
 	}
-	goto __finally28;
-	__catch28_g_error:
+	goto __finally27;
+	__catch27_g_error:
 	{
 		GError* e = NULL;
+		GError* _tmp6_ = NULL;
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
 #line 76 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:76: Could not load autosave infomation; not rest" \
-"oring any autosaves");
+		_tmp6_ = e;
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (!g_error_matches (_tmp6_, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
+#line 297 "autosave-manager.c"
+			GError* _tmp7_ = NULL;
+			const gchar* _tmp8_ = NULL;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_error_free0 (e);
+			_tmp7_ = e;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_key_file_unref0 (file);
+			_tmp8_ = _tmp7_->message;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			g_warning ("autosave-manager.vala:77: Could not load autosave infomation; not rest" \
+"oring any autosaves: %s", _tmp8_);
+#line 306 "autosave-manager.c"
+		}
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_error_free0 (e);
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_key_file_unref0 (file);
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
-#line 300 "autosave-manager.c"
+#line 314 "autosave-manager.c"
 	}
-	__finally28:
+	__finally27:
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_inner_error_ != NULL) {
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -310,771 +324,778 @@ void autosave_manager_load (AutosaveManager* self) {
 		g_clear_error (&_inner_error_);
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
-#line 313 "autosave-manager.c"
+#line 327 "autosave-manager.c"
 	}
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp6_ = file;
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp7_ = autosave_manager_get_value (self, _tmp6_, "simple-scan", "pages", "");
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	pages = _tmp7_;
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp8_ = pages;
+	_tmp9_ = file;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp10_ = autosave_manager_get_value (self, _tmp9_, "simple-scan", "pages", "");
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp10_ = _tmp9_ = g_strsplit (_tmp8_, " ", 0);
-#line 325 "autosave-manager.c"
+	pages = _tmp10_;
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp11_ = pages;
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp13_ = _tmp12_ = g_strsplit (_tmp11_, " ", 0);
+#line 339 "autosave-manager.c"
 	{
 		gchar** page_name_collection = NULL;
 		gint page_name_collection_length1 = 0;
 		gint _page_name_collection_size_ = 0;
 		gint page_name_it = 0;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		page_name_collection = _tmp10_;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		page_name_collection_length1 = _vala_array_length (_tmp9_);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		for (page_name_it = 0; page_name_it < _vala_array_length (_tmp9_); page_name_it = page_name_it + 1) {
-#line 337 "autosave-manager.c"
-			gchar* _tmp11_ = NULL;
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		page_name_collection = _tmp13_;
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		page_name_collection_length1 = _vala_array_length (_tmp12_);
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		for (page_name_it = 0; page_name_it < _vala_array_length (_tmp12_); page_name_it = page_name_it + 1) {
+#line 351 "autosave-manager.c"
+			gchar* _tmp14_ = NULL;
 			gchar* page_name = NULL;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp11_ = g_strdup (page_name_collection[page_name_it]);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			page_name = _tmp11_;
-#line 344 "autosave-manager.c"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp14_ = g_strdup (page_name_collection[page_name_it]);
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			page_name = _tmp14_;
+#line 358 "autosave-manager.c"
 			{
-				const gchar* _tmp12_ = NULL;
+				const gchar* _tmp15_ = NULL;
 				gint scan_width = 0;
-				GKeyFile* _tmp13_ = NULL;
-				const gchar* _tmp14_ = NULL;
-				gint _tmp15_ = 0;
-				gint scan_height = 0;
 				GKeyFile* _tmp16_ = NULL;
 				const gchar* _tmp17_ = NULL;
 				gint _tmp18_ = 0;
-				gint rowstride = 0;
+				gint scan_height = 0;
 				GKeyFile* _tmp19_ = NULL;
 				const gchar* _tmp20_ = NULL;
 				gint _tmp21_ = 0;
-				gint n_channels = 0;
+				gint rowstride = 0;
 				GKeyFile* _tmp22_ = NULL;
 				const gchar* _tmp23_ = NULL;
 				gint _tmp24_ = 0;
-				gint depth = 0;
+				gint n_channels = 0;
 				GKeyFile* _tmp25_ = NULL;
 				const gchar* _tmp26_ = NULL;
 				gint _tmp27_ = 0;
-				gint dpi = 0;
+				gint depth = 0;
 				GKeyFile* _tmp28_ = NULL;
 				const gchar* _tmp29_ = NULL;
 				gint _tmp30_ = 0;
-				gchar* scan_direction_name = NULL;
+				gint dpi = 0;
 				GKeyFile* _tmp31_ = NULL;
 				const gchar* _tmp32_ = NULL;
-				gchar* _tmp33_ = NULL;
-				ScanDirection scan_direction = 0;
-				const gchar* _tmp34_ = NULL;
+				gint _tmp33_ = 0;
+				gchar* scan_direction_name = NULL;
+				GKeyFile* _tmp34_ = NULL;
 				const gchar* _tmp35_ = NULL;
-				GQuark _tmp37_ = 0U;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				static GQuark _tmp36_label0 = 0;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				static GQuark _tmp36_label1 = 0;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				static GQuark _tmp36_label2 = 0;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				static GQuark _tmp36_label3 = 0;
-#line 387 "autosave-manager.c"
+				gchar* _tmp36_ = NULL;
+				ScanDirection scan_direction = 0;
+				const gchar* _tmp37_ = NULL;
+				const gchar* _tmp38_ = NULL;
+				GQuark _tmp40_ = 0U;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				static GQuark _tmp39_label0 = 0;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				static GQuark _tmp39_label1 = 0;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				static GQuark _tmp39_label2 = 0;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				static GQuark _tmp39_label3 = 0;
+#line 401 "autosave-manager.c"
 				gchar* color_profile = NULL;
-				GKeyFile* _tmp38_ = NULL;
-				const gchar* _tmp39_ = NULL;
-				gchar* _tmp40_ = NULL;
-				const gchar* _tmp41_ = NULL;
+				GKeyFile* _tmp41_ = NULL;
+				const gchar* _tmp42_ = NULL;
+				gchar* _tmp43_ = NULL;
+				const gchar* _tmp44_ = NULL;
 				gchar* pixels_filename = NULL;
-				GKeyFile* _tmp42_ = NULL;
-				const gchar* _tmp43_ = NULL;
-				gchar* _tmp44_ = NULL;
-				gboolean has_crop = FALSE;
 				GKeyFile* _tmp45_ = NULL;
 				const gchar* _tmp46_ = NULL;
-				gboolean _tmp47_ = FALSE;
-				gchar* crop_name = NULL;
+				gchar* _tmp47_ = NULL;
+				gboolean has_crop = FALSE;
 				GKeyFile* _tmp48_ = NULL;
 				const gchar* _tmp49_ = NULL;
-				gchar* _tmp50_ = NULL;
-				const gchar* _tmp51_ = NULL;
+				gboolean _tmp50_ = FALSE;
+				gchar* crop_name = NULL;
+				GKeyFile* _tmp51_ = NULL;
+				const gchar* _tmp52_ = NULL;
+				gchar* _tmp53_ = NULL;
+				const gchar* _tmp54_ = NULL;
 				gint crop_x = 0;
-				GKeyFile* _tmp52_ = NULL;
-				const gchar* _tmp53_ = NULL;
-				gint _tmp54_ = 0;
-				gint crop_y = 0;
 				GKeyFile* _tmp55_ = NULL;
 				const gchar* _tmp56_ = NULL;
 				gint _tmp57_ = 0;
-				gint crop_width = 0;
+				gint crop_y = 0;
 				GKeyFile* _tmp58_ = NULL;
 				const gchar* _tmp59_ = NULL;
 				gint _tmp60_ = 0;
-				gint crop_height = 0;
+				gint crop_width = 0;
 				GKeyFile* _tmp61_ = NULL;
 				const gchar* _tmp62_ = NULL;
 				gint _tmp63_ = 0;
+				gint crop_height = 0;
+				GKeyFile* _tmp64_ = NULL;
+				const gchar* _tmp65_ = NULL;
+				gint _tmp66_ = 0;
 				guchar* pixels = NULL;
 				gint pixels_length1 = 0;
 				gint _pixels_size_ = 0;
-				const gchar* _tmp64_ = NULL;
+				const gchar* _tmp67_ = NULL;
 				Page* page = NULL;
-				gint _tmp73_ = 0;
-				gint _tmp74_ = 0;
-				gint _tmp75_ = 0;
 				gint _tmp76_ = 0;
 				gint _tmp77_ = 0;
 				gint _tmp78_ = 0;
-				ScanDirection _tmp79_ = 0;
-				const gchar* _tmp80_ = NULL;
-				guchar* _tmp81_ = NULL;
-				gint _tmp81__length1 = 0;
-				gboolean _tmp82_ = FALSE;
+				gint _tmp79_ = 0;
+				gint _tmp80_ = 0;
+				gint _tmp81_ = 0;
+				ScanDirection _tmp82_ = 0;
 				const gchar* _tmp83_ = NULL;
-				gint _tmp84_ = 0;
-				gint _tmp85_ = 0;
-				gint _tmp86_ = 0;
+				guchar* _tmp84_ = NULL;
+				gint _tmp84__length1 = 0;
+				gboolean _tmp85_ = FALSE;
+				const gchar* _tmp86_ = NULL;
 				gint _tmp87_ = 0;
-				Page* _tmp88_ = NULL;
-				GHashTable* _tmp89_ = NULL;
-				Page* _tmp90_ = NULL;
+				gint _tmp88_ = 0;
+				gint _tmp89_ = 0;
+				gint _tmp90_ = 0;
 				Page* _tmp91_ = NULL;
-				const gchar* _tmp92_ = NULL;
-				gchar* _tmp93_ = NULL;
-				Book* _tmp94_ = NULL;
-				Book* _tmp95_ = NULL;
-				Page* _tmp96_ = NULL;
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp12_ = page_name;
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_debug ("autosave-manager.vala:82: Loading automatically saved page %s", _tmp12_);
-#line 84 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp13_ = file;
-#line 84 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp14_ = page_name;
-#line 84 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp15_ = autosave_manager_get_integer (self, _tmp13_, _tmp14_, "scan-width", 0);
-#line 84 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				scan_width = _tmp15_;
+				GHashTable* _tmp92_ = NULL;
+				Page* _tmp93_ = NULL;
+				Page* _tmp94_ = NULL;
+				const gchar* _tmp95_ = NULL;
+				gchar* _tmp96_ = NULL;
+				Book* _tmp97_ = NULL;
+				Book* _tmp98_ = NULL;
+				Page* _tmp99_ = NULL;
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp15_ = page_name;
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_debug ("autosave-manager.vala:83: Loading automatically saved page %s", _tmp15_);
 #line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp16_ = file;
 #line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp17_ = page_name;
 #line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp18_ = autosave_manager_get_integer (self, _tmp16_, _tmp17_, "scan-height", 0);
+				_tmp18_ = autosave_manager_get_integer (self, _tmp16_, _tmp17_, "scan-width", 0);
 #line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				scan_height = _tmp18_;
+				scan_width = _tmp18_;
 #line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp19_ = file;
 #line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp20_ = page_name;
 #line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp21_ = autosave_manager_get_integer (self, _tmp19_, _tmp20_, "rowstride", 0);
+				_tmp21_ = autosave_manager_get_integer (self, _tmp19_, _tmp20_, "scan-height", 0);
 #line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				rowstride = _tmp21_;
+				scan_height = _tmp21_;
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp22_ = file;
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp23_ = page_name;
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp24_ = autosave_manager_get_integer (self, _tmp22_, _tmp23_, "n-channels", 0);
+				_tmp24_ = autosave_manager_get_integer (self, _tmp22_, _tmp23_, "rowstride", 0);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				n_channels = _tmp24_;
+				rowstride = _tmp24_;
 #line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp25_ = file;
 #line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp26_ = page_name;
 #line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp27_ = autosave_manager_get_integer (self, _tmp25_, _tmp26_, "depth", 0);
+				_tmp27_ = autosave_manager_get_integer (self, _tmp25_, _tmp26_, "n-channels", 0);
 #line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				depth = _tmp27_;
+				n_channels = _tmp27_;
 #line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp28_ = file;
 #line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp29_ = page_name;
 #line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp30_ = autosave_manager_get_integer (self, _tmp28_, _tmp29_, "dpi", 0);
+				_tmp30_ = autosave_manager_get_integer (self, _tmp28_, _tmp29_, "depth", 0);
 #line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				dpi = _tmp30_;
+				depth = _tmp30_;
 #line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp31_ = file;
 #line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp32_ = page_name;
 #line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp33_ = autosave_manager_get_value (self, _tmp31_, _tmp32_, "scan-direction", "");
+				_tmp33_ = autosave_manager_get_integer (self, _tmp31_, _tmp32_, "dpi", 0);
 #line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				scan_direction_name = _tmp33_;
+				dpi = _tmp33_;
 #line 91 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp34_ = scan_direction_name;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp35_ = _tmp34_;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp37_ = (NULL == _tmp35_) ? 0 : g_quark_from_string (_tmp35_);
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (_tmp37_ == ((0 != _tmp36_label0) ? _tmp36_label0 : (_tmp36_label0 = g_quark_from_static_string ("TOP_TO_BOTTOM")))) {
+				_tmp34_ = file;
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp35_ = page_name;
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp36_ = autosave_manager_get_value (self, _tmp34_, _tmp35_, "scan-direction", "");
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				scan_direction_name = _tmp36_;
 #line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp37_ = scan_direction_name;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp38_ = _tmp37_;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp40_ = (NULL == _tmp38_) ? 0 : g_quark_from_string (_tmp38_);
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (_tmp40_ == ((0 != _tmp39_label0) ? _tmp39_label0 : (_tmp39_label0 = g_quark_from_static_string ("TOP_TO_BOTTOM")))) {
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					switch (0) {
-#line 524 "autosave-manager.c"
+#line 538 "autosave-manager.c"
 						default:
 						{
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-							scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
 #line 96 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+							scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 							break;
-#line 531 "autosave-manager.c"
+#line 545 "autosave-manager.c"
 						}
 					}
-				} else if (_tmp37_ == ((0 != _tmp36_label1) ? _tmp36_label1 : (_tmp36_label1 = g_quark_from_static_string ("LEFT_TO_RIGHT")))) {
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				} else if (_tmp40_ == ((0 != _tmp39_label1) ? _tmp39_label1 : (_tmp39_label1 = g_quark_from_static_string ("LEFT_TO_RIGHT")))) {
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					switch (0) {
-#line 537 "autosave-manager.c"
+#line 551 "autosave-manager.c"
 						default:
 						{
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-							scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
 #line 99 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+							scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 							break;
-#line 544 "autosave-manager.c"
+#line 558 "autosave-manager.c"
 						}
 					}
-				} else if (_tmp37_ == ((0 != _tmp36_label2) ? _tmp36_label2 : (_tmp36_label2 = g_quark_from_static_string ("BOTTOM_TO_TOP")))) {
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				} else if (_tmp40_ == ((0 != _tmp39_label2) ? _tmp39_label2 : (_tmp39_label2 = g_quark_from_static_string ("BOTTOM_TO_TOP")))) {
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					switch (0) {
-#line 550 "autosave-manager.c"
+#line 564 "autosave-manager.c"
 						default:
 						{
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-							scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
 #line 102 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+							scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 							break;
-#line 557 "autosave-manager.c"
+#line 571 "autosave-manager.c"
 						}
 					}
-				} else if (_tmp37_ == ((0 != _tmp36_label3) ? _tmp36_label3 : (_tmp36_label3 = g_quark_from_static_string ("RIGHT_TO_LEFT")))) {
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				} else if (_tmp40_ == ((0 != _tmp39_label3) ? _tmp39_label3 : (_tmp39_label3 = g_quark_from_static_string ("RIGHT_TO_LEFT")))) {
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					switch (0) {
-#line 563 "autosave-manager.c"
+#line 577 "autosave-manager.c"
 						default:
 						{
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-							scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+							scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 							break;
-#line 570 "autosave-manager.c"
+#line 584 "autosave-manager.c"
 						}
 					}
 				}
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp38_ = file;
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp39_ = page_name;
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp40_ = autosave_manager_get_value (self, _tmp38_, _tmp39_, "color-profile", "");
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				color_profile = _tmp40_;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp41_ = color_profile;
+				_tmp41_ = file;
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp42_ = page_name;
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp43_ = autosave_manager_get_value (self, _tmp41_, _tmp42_, "color-profile", "");
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (g_strcmp0 (_tmp41_, "") == 0) {
+				color_profile = _tmp43_;
 #line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (color_profile);
+				_tmp44_ = color_profile;
 #line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					color_profile = NULL;
-#line 590 "autosave-manager.c"
-				}
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp42_ = file;
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp43_ = page_name;
+				if (g_strcmp0 (_tmp44_, "") == 0) {
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp44_ = autosave_manager_get_value (self, _tmp42_, _tmp43_, "pixels-filename", "");
+					_g_free0 (color_profile);
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				pixels_filename = _tmp44_;
+					color_profile = NULL;
+#line 604 "autosave-manager.c"
+				}
 #line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp45_ = file;
 #line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp46_ = page_name;
 #line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp47_ = autosave_manager_get_boolean (self, _tmp45_, _tmp46_, "has-crop", FALSE);
+				_tmp47_ = autosave_manager_get_value (self, _tmp45_, _tmp46_, "pixels-filename", "");
 #line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				has_crop = _tmp47_;
+				pixels_filename = _tmp47_;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp48_ = file;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp49_ = page_name;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp50_ = autosave_manager_get_value (self, _tmp48_, _tmp49_, "crop-name", "");
+				_tmp50_ = autosave_manager_get_boolean (self, _tmp48_, _tmp49_, "has-crop", FALSE);
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				crop_name = _tmp50_;
+				has_crop = _tmp50_;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp51_ = file;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp52_ = page_name;
 #line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp51_ = crop_name;
+				_tmp53_ = autosave_manager_get_value (self, _tmp51_, _tmp52_, "crop-name", "");
 #line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (g_strcmp0 (_tmp51_, "") == 0) {
+				crop_name = _tmp53_;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (crop_name);
+				_tmp54_ = crop_name;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					crop_name = NULL;
-#line 624 "autosave-manager.c"
-				}
-#line 115 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp52_ = file;
+				if (g_strcmp0 (_tmp54_, "") == 0) {
 #line 115 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp53_ = page_name;
-#line 115 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp54_ = autosave_manager_get_integer (self, _tmp52_, _tmp53_, "crop-x", 0);
+					_g_free0 (crop_name);
 #line 115 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				crop_x = _tmp54_;
+					crop_name = NULL;
+#line 638 "autosave-manager.c"
+				}
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp55_ = file;
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp56_ = page_name;
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp57_ = autosave_manager_get_integer (self, _tmp55_, _tmp56_, "crop-y", 0);
+				_tmp57_ = autosave_manager_get_integer (self, _tmp55_, _tmp56_, "crop-x", 0);
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				crop_y = _tmp57_;
+				crop_x = _tmp57_;
 #line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp58_ = file;
 #line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp59_ = page_name;
 #line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp60_ = autosave_manager_get_integer (self, _tmp58_, _tmp59_, "crop-width", 0);
+				_tmp60_ = autosave_manager_get_integer (self, _tmp58_, _tmp59_, "crop-y", 0);
 #line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				crop_width = _tmp60_;
+				crop_y = _tmp60_;
 #line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp61_ = file;
 #line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp62_ = page_name;
 #line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp63_ = autosave_manager_get_integer (self, _tmp61_, _tmp62_, "crop-height", 0);
+				_tmp63_ = autosave_manager_get_integer (self, _tmp61_, _tmp62_, "crop-width", 0);
 #line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				crop_height = _tmp63_;
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				crop_width = _tmp63_;
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp64_ = file;
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp65_ = page_name;
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp66_ = autosave_manager_get_integer (self, _tmp64_, _tmp65_, "crop-height", 0);
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				crop_height = _tmp66_;
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				pixels = NULL;
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				pixels_length1 = 0;
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_pixels_size_ = pixels_length1;
 #line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp64_ = pixels_filename;
+				pixels_length1 = 0;
 #line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (g_strcmp0 (_tmp64_, "") != 0) {
-#line 668 "autosave-manager.c"
+				_pixels_size_ = pixels_length1;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp67_ = pixels_filename;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (g_strcmp0 (_tmp67_, "") != 0) {
+#line 682 "autosave-manager.c"
 					gchar* path = NULL;
-					const gchar* _tmp65_ = NULL;
-					const gchar* _tmp66_ = NULL;
-					gchar* _tmp67_ = NULL;
-					GFile* f = NULL;
 					const gchar* _tmp68_ = NULL;
-					GFile* _tmp69_ = NULL;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp65_ = autosave_manager_AUTOSAVE_DIR;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp66_ = pixels_filename;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp67_ = g_build_filename (_tmp65_, _tmp66_, NULL);
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					path = _tmp67_;
+					const gchar* _tmp69_ = NULL;
+					gchar* _tmp70_ = NULL;
+					GFile* f = NULL;
+					const gchar* _tmp71_ = NULL;
+					GFile* _tmp72_ = NULL;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp68_ = autosave_manager_AUTOSAVE_DIR;
 #line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp68_ = path;
+					_tmp69_ = pixels_filename;
 #line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp69_ = g_file_new_for_path (_tmp68_);
+					_tmp70_ = g_build_filename (_tmp68_, _tmp69_, NULL);
 #line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					f = _tmp69_;
-#line 690 "autosave-manager.c"
+					path = _tmp70_;
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp71_ = path;
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp72_ = g_file_new_for_path (_tmp71_);
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					f = _tmp72_;
+#line 704 "autosave-manager.c"
 					{
-						GFile* _tmp70_ = NULL;
-						guint8* _tmp71_ = NULL;
-						gsize _tmp72_;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp70_ = f;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_file_load_contents (_tmp70_, NULL, &_tmp71_, &_tmp72_, NULL, &_inner_error_);
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						GFile* _tmp73_ = NULL;
+						guint8* _tmp74_ = NULL;
+						gsize _tmp75_;
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp73_ = f;
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_file_load_contents (_tmp73_, NULL, &_tmp74_, &_tmp75_, NULL, &_inner_error_);
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						pixels = (g_free (pixels), NULL);
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						pixels = _tmp71_;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						pixels_length1 = _tmp72_;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						pixels = _tmp74_;
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						pixels_length1 = _tmp75_;
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_pixels_size_ = pixels_length1;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						if (_inner_error_ != NULL) {
-#line 709 "autosave-manager.c"
-							goto __catch29_g_error;
+#line 723 "autosave-manager.c"
+							goto __catch28_g_error;
 						}
 					}
-					goto __finally29;
-					__catch29_g_error:
+					goto __finally28;
+					__catch28_g_error:
 					{
 						GError* e = NULL;
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						e = _inner_error_;
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_inner_error_ = NULL;
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_warning ("autosave-manager.vala:131: Failed to load pixel information");
 #line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_warning ("autosave-manager.vala:132: Failed to load pixel information");
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_error_free0 (e);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_object_unref0 (f);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (path);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						pixels = (g_free (pixels), NULL);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (crop_name);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (pixels_filename);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (color_profile);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (scan_direction_name);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (page_name);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						continue;
-#line 743 "autosave-manager.c"
+#line 757 "autosave-manager.c"
 					}
-					__finally29:
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					__finally28:
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					if (_inner_error_ != NULL) {
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_object_unref0 (f);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (path);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						pixels = (g_free (pixels), NULL);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (crop_name);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (pixels_filename);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (color_profile);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (scan_direction_name);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (page_name);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						page_name_collection = (_vala_array_free (page_name_collection, page_name_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (pages);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_key_file_unref0 (file);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/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 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						g_clear_error (&_inner_error_);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						return;
-#line 776 "autosave-manager.c"
+#line 790 "autosave-manager.c"
 					}
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_g_object_unref0 (f);
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_g_free0 (path);
-#line 782 "autosave-manager.c"
+#line 796 "autosave-manager.c"
 				}
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp73_ = scan_width;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp74_ = scan_height;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp75_ = rowstride;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp76_ = n_channels;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp77_ = depth;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp78_ = dpi;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp79_ = scan_direction;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp80_ = color_profile;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp81_ = pixels;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp81__length1 = pixels_length1;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp82_ = has_crop;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp83_ = crop_name;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp84_ = crop_x;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp85_ = crop_y;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp86_ = crop_width;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp87_ = crop_height;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp88_ = page_new_from_data (_tmp73_, _tmp74_, _tmp75_, _tmp76_, _tmp77_, _tmp78_, _tmp79_, _tmp80_, _tmp81_, _tmp81__length1, _tmp82_, _tmp83_, _tmp84_, _tmp85_, _tmp86_, _tmp87_);
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				page = _tmp88_;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp89_ = self->priv->page_filenames;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp90_ = page;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp91_ = _page_ref0 (_tmp90_);
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp92_ = pixels_filename;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp93_ = g_strdup (_tmp92_);
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_hash_table_insert (_tmp89_, _tmp91_, _tmp93_);
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp76_ = scan_width;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp77_ = scan_height;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp78_ = rowstride;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp79_ = n_channels;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp80_ = depth;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp81_ = dpi;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp82_ = scan_direction;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp83_ = color_profile;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp84_ = pixels;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp84__length1 = pixels_length1;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp85_ = has_crop;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp86_ = crop_name;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp87_ = crop_x;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp88_ = crop_y;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp89_ = crop_width;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp90_ = crop_height;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp91_ = page_new_from_data (_tmp76_, _tmp77_, _tmp78_, _tmp79_, _tmp80_, _tmp81_, _tmp82_, _tmp83_, _tmp84_, _tmp84__length1, _tmp85_, _tmp86_, _tmp87_, _tmp88_, _tmp89_, _tmp90_);
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				page = _tmp91_;
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp94_ = autosave_manager_get_book (self);
+				_tmp92_ = self->priv->page_filenames;
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp95_ = _tmp94_;
+				_tmp93_ = page;
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp96_ = page;
+				_tmp94_ = _page_ref0 (_tmp93_);
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				book_append_page (_tmp95_, _tmp96_);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp95_ = pixels_filename;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp96_ = g_strdup (_tmp95_);
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_hash_table_insert (_tmp92_, _tmp94_, _tmp96_);
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp97_ = autosave_manager_get_book (self);
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp98_ = _tmp97_;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp99_ = page;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				book_append_page (_tmp98_, _tmp99_);
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_page_unref0 (page);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				pixels = (g_free (pixels), NULL);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (crop_name);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (pixels_filename);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (color_profile);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (scan_direction_name);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (page_name);
-#line 854 "autosave-manager.c"
+#line 868 "autosave-manager.c"
 			}
 		}
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		page_name_collection = (_vala_array_free (page_name_collection, page_name_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 859 "autosave-manager.c"
+#line 873 "autosave-manager.c"
 	}
 #line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_free0 (pages);
 #line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_key_file_unref0 (file);
-#line 865 "autosave-manager.c"
+#line 879 "autosave-manager.c"
 }
 
 
 static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, const gchar* _default_) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (file != NULL, NULL);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (group_name != NULL, NULL);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (_default_ != NULL, NULL);
-#line 882 "autosave-manager.c"
+#line 896 "autosave-manager.c"
 	{
 		gchar* _tmp0_ = NULL;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		gchar* _tmp5_ = NULL;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp1_ = file;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp2_ = group_name;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp3_ = key;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp4_ = g_key_file_get_value (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = _tmp4_;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (_inner_error_ != NULL) {
-#line 901 "autosave-manager.c"
-			goto __catch30_g_error;
+#line 916 "autosave-manager.c"
+			goto __catch29_g_error;
 		}
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		result = _tmp0_;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp5_ = _tmp0_;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp0_ = NULL;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		result = _tmp5_;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (_tmp0_);
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return result;
-#line 908 "autosave-manager.c"
+#line 929 "autosave-manager.c"
 	}
-	goto __finally30;
-	__catch30_g_error:
+	goto __finally29;
+	__catch29_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		const gchar* _tmp6_ = NULL;
+		gchar* _tmp7_ = NULL;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp5_ = _default_;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp6_ = g_strdup (_tmp5_);
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		result = _tmp6_;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp6_ = _default_;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp7_ = g_strdup (_tmp6_);
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		result = _tmp7_;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_error_free0 (e);
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return result;
-#line 930 "autosave-manager.c"
+#line 951 "autosave-manager.c"
 	}
-	__finally30:
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	__finally29:
+#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 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_clear_error (&_inner_error_);
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return NULL;
-#line 939 "autosave-manager.c"
+#line 960 "autosave-manager.c"
 }
 
 
 static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, gint _default_) {
 	gint result = 0;
 	GError * _inner_error_ = NULL;
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (file != NULL, 0);
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (group_name != NULL, 0);
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (key != NULL, 0);
-#line 954 "autosave-manager.c"
+#line 975 "autosave-manager.c"
 	{
 		gint _tmp0_ = 0;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp1_ = file;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp2_ = group_name;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp3_ = key;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp4_ = g_key_file_get_integer (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = _tmp4_;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (_inner_error_ != NULL) {
-#line 973 "autosave-manager.c"
-			goto __catch31_g_error;
+#line 994 "autosave-manager.c"
+			goto __catch30_g_error;
 		}
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		result = _tmp0_;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return result;
-#line 980 "autosave-manager.c"
+#line 1001 "autosave-manager.c"
 	}
-	goto __finally31;
-	__catch31_g_error:
+	goto __finally30;
+	__catch30_g_error:
 	{
 		GError* e = NULL;
 		gint _tmp5_ = 0;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp5_ = _default_;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		result = _tmp5_;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_error_free0 (e);
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return result;
-#line 999 "autosave-manager.c"
+#line 1020 "autosave-manager.c"
 	}
-	__finally31:
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	__finally30:
+#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 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_clear_error (&_inner_error_);
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return 0;
-#line 1008 "autosave-manager.c"
+#line 1029 "autosave-manager.c"
 }
 
 
 static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, gboolean _default_) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 180 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 180 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (file != NULL, FALSE);
-#line 180 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (group_name != NULL, FALSE);
-#line 180 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
-#line 1023 "autosave-manager.c"
+#line 1044 "autosave-manager.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp1_ = file;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp2_ = group_name;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp3_ = key;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp4_ = g_key_file_get_boolean (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = _tmp4_;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (_inner_error_ != NULL) {
-#line 1042 "autosave-manager.c"
-			goto __catch32_g_error;
+#line 1063 "autosave-manager.c"
+			goto __catch31_g_error;
 		}
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		result = _tmp0_;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return result;
-#line 1049 "autosave-manager.c"
+#line 1070 "autosave-manager.c"
 	}
-	goto __finally32;
-	__catch32_g_error:
+	goto __finally31;
+	__catch31_g_error:
 	{
 		GError* e = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp5_ = _default_;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		result = _tmp5_;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_error_free0 (e);
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return result;
-#line 1068 "autosave-manager.c"
+#line 1089 "autosave-manager.c"
 	}
-	__finally32:
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	__finally31:
+#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 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_clear_error (&_inner_error_);
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return FALSE;
-#line 1077 "autosave-manager.c"
+#line 1098 "autosave-manager.c"
 }
 
 
@@ -1082,168 +1103,175 @@ void autosave_manager_cleanup (AutosaveManager* self) {
 	guint _tmp0_ = 0U;
 	GDir* dir = NULL;
 	GError * _inner_error_ = NULL;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_debug ("autosave-manager.vala:194: Deleting autosave records");
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_debug ("autosave-manager.vala:195: Deleting autosave records");
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = self->priv->update_timeout;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_tmp0_ > ((guint) 0)) {
-#line 1093 "autosave-manager.c"
+#line 1114 "autosave-manager.c"
 		guint _tmp1_ = 0U;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp1_ = self->priv->update_timeout;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_source_remove (_tmp1_);
-#line 1099 "autosave-manager.c"
+#line 1120 "autosave-manager.c"
 	}
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->priv->update_timeout = (guint) 0;
-#line 1103 "autosave-manager.c"
+#line 1124 "autosave-manager.c"
 	{
 		GDir* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		GDir* _tmp4_ = NULL;
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		GDir* _tmp5_ = NULL;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp3_ = autosave_manager_AUTOSAVE_DIR;
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp4_ = g_dir_open (_tmp3_, (guint) 0, &_inner_error_);
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp2_ = _tmp4_;
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (_inner_error_ != NULL) {
-#line 1116 "autosave-manager.c"
-			goto __catch33_g_error;
+#line 1138 "autosave-manager.c"
+			goto __catch32_g_error;
 		}
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp5_ = _tmp2_;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp2_ = NULL;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_dir_close0 (dir);
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		dir = _tmp2_;
-#line 1123 "autosave-manager.c"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		dir = _tmp5_;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_dir_close0 (_tmp2_);
+#line 1151 "autosave-manager.c"
 	}
-	goto __finally33;
-	__catch33_g_error:
+	goto __finally32;
+	__catch32_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		GError* _tmp6_ = NULL;
+		const gchar* _tmp7_ = NULL;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 207 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp5_ = e;
-#line 207 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp6_ = _tmp5_->message;
-#line 207 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:207: Failed to delete autosaves: %s", _tmp6_);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_error_free0 (e);
+		_tmp6_ = e;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_dir_close0 (dir);
+		_tmp7_ = _tmp6_->message;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:208: Failed to delete autosaves: %s", _tmp7_);
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_error_free0 (e);
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_dir_close0 (dir);
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
-#line 1147 "autosave-manager.c"
+#line 1175 "autosave-manager.c"
 	}
-	__finally33:
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	__finally32:
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_inner_error_ != NULL) {
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_dir_close0 (dir);
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 202 "/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 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_clear_error (&_inner_error_);
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
-#line 1160 "autosave-manager.c"
+#line 1188 "autosave-manager.c"
 	}
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	while (TRUE) {
-#line 1164 "autosave-manager.c"
+#line 1192 "autosave-manager.c"
 		gchar* filename = NULL;
-		GDir* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gchar* path = NULL;
+		GDir* _tmp8_ = NULL;
+		const gchar* _tmp9_ = NULL;
+		gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
+		gchar* path = NULL;
 		const gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp7_ = dir;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp8_ = g_dir_read_name (_tmp7_);
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp9_ = g_strdup (_tmp8_);
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		filename = _tmp9_;
+		const gchar* _tmp13_ = NULL;
+		gchar* _tmp14_ = NULL;
+		const gchar* _tmp15_ = NULL;
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp8_ = dir;
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp9_ = g_dir_read_name (_tmp8_);
 #line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp10_ = filename;
+		_tmp10_ = g_strdup (_tmp9_);
 #line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_tmp10_ == NULL) {
+		filename = _tmp10_;
 #line 215 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_g_free0 (filename);
+		_tmp11_ = filename;
 #line 215 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			break;
-#line 1191 "autosave-manager.c"
-		}
+		if (_tmp11_ == NULL) {
 #line 216 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp11_ = autosave_manager_AUTOSAVE_DIR;
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp12_ = filename;
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp13_ = g_build_filename (_tmp11_, _tmp12_, NULL);
+			_g_free0 (filename);
 #line 216 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		path = _tmp13_;
+			break;
+#line 1219 "autosave-manager.c"
+		}
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp12_ = autosave_manager_AUTOSAVE_DIR;
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp13_ = filename;
 #line 217 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp14_ = path;
+		_tmp14_ = g_build_filename (_tmp12_, _tmp13_, NULL);
 #line 217 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_unlink (_tmp14_);
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		path = _tmp14_;
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp15_ = path;
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_unlink (_tmp15_);
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (path);
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (filename);
-#line 1209 "autosave-manager.c"
+#line 1237 "autosave-manager.c"
 	}
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_dir_close0 (dir);
-#line 1213 "autosave-manager.c"
+#line 1241 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_scan_finished_page_scan_finished (Page* _sender, gpointer self) {
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_scan_finished (self, _sender);
-#line 1220 "autosave-manager.c"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_on_scan_finished ((AutosaveManager*) self, _sender);
+#line 1248 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_changed_page_crop_changed (Page* _sender, gpointer self) {
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_changed (self);
-#line 1227 "autosave-manager.c"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_on_changed ((AutosaveManager*) self);
+#line 1255 "autosave-manager.c"
 }
 
 
 void autosave_manager_on_page_added (AutosaveManager* self, Page* page) {
 	Page* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (page != NULL);
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = page;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp0_, "scan-finished", (GCallback) _autosave_manager_on_scan_finished_page_scan_finished, self);
 #line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_connect (_tmp0_, "scan-finished", (GCallback) _autosave_manager_on_scan_finished_page_scan_finished, self);
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp1_ = page;
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_connect (_tmp1_, "crop-changed", (GCallback) _autosave_manager_on_changed_page_crop_changed, self);
-#line 1246 "autosave-manager.c"
+#line 1274 "autosave-manager.c"
 }
 
 
@@ -1260,179 +1288,176 @@ void autosave_manager_on_page_removed (AutosaveManager* self, Page* page) {
 	const gchar* _tmp8_ = NULL;
 	GHashTable* _tmp10_ = NULL;
 	Page* _tmp11_ = NULL;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (page != NULL);
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = page;
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_parse_name ("scan-finished", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _autosave_manager_on_scan_finished_page_scan_finished, self);
 #line 230 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _autosave_manager_on_scan_finished_page_scan_finished, self);
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp2_ = page;
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _autosave_manager_on_changed_page_crop_changed, self);
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp4_ = self->priv->page_filenames;
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp5_ = page;
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp6_ = g_hash_table_lookup (_tmp4_, _tmp5_);
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp7_ = g_strdup ((const gchar*) _tmp6_);
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	filename = _tmp7_;
 #line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	filename = _tmp7_;
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp8_ = filename;
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_tmp8_ != NULL) {
-#line 1293 "autosave-manager.c"
+#line 1321 "autosave-manager.c"
 		const gchar* _tmp9_ = NULL;
-#line 234 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp9_ = filename;
-#line 234 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_unlink (_tmp9_);
-#line 1299 "autosave-manager.c"
+#line 1327 "autosave-manager.c"
 	}
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp10_ = self->priv->page_filenames;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp11_ = page;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_hash_table_remove (_tmp10_, _tmp11_);
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_free0 (filename);
-#line 1309 "autosave-manager.c"
+#line 1337 "autosave-manager.c"
 }
 
 
 void autosave_manager_on_scan_finished (AutosaveManager* self, Page* page) {
 	Page* _tmp0_ = NULL;
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (page != NULL);
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = page;
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_save_pixels (self, _tmp0_);
 #line 241 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_save_pixels (self, _tmp0_);
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_save (self, FALSE);
-#line 1325 "autosave-manager.c"
+#line 1353 "autosave-manager.c"
 }
 
 
 void autosave_manager_on_changed (AutosaveManager* self) {
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_save (self, TRUE);
-#line 1334 "autosave-manager.c"
+#line 1362 "autosave-manager.c"
 }
 
 
 void autosave_manager_on_cleared (AutosaveManager* self) {
 	GHashTable* _tmp0_ = NULL;
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = self->priv->page_filenames;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_hash_table_remove_all (_tmp0_);
 #line 252 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_hash_table_remove_all (_tmp0_);
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_save (self, TRUE);
-#line 1348 "autosave-manager.c"
+#line 1376 "autosave-manager.c"
 }
 
 
-static gboolean ___lambda2_ (AutosaveManager* self) {
+static gboolean ___lambda3_ (AutosaveManager* self) {
 	gboolean result = FALSE;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_real_save (self);
 #line 270 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv->update_timeout = (guint) 0;
+	autosave_manager_real_save (self);
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self->priv->update_timeout = (guint) 0;
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	result = FALSE;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return result;
-#line 1362 "autosave-manager.c"
+#line 1390 "autosave-manager.c"
 }
 
 
-static gboolean ____lambda2__gsource_func (gpointer self) {
+static gboolean ____lambda3__gsource_func (gpointer self) {
 	gboolean result;
-	result = ___lambda2_ (self);
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	result = ___lambda3_ ((AutosaveManager*) self);
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return result;
-#line 1371 "autosave-manager.c"
+#line 1399 "autosave-manager.c"
 }
 
 
 static void autosave_manager_save (AutosaveManager* self, gboolean do_timeout) {
 	gboolean _tmp0_ = FALSE;
 	guint _tmp1_ = 0U;
-	gboolean _tmp3_ = FALSE;
-	guint _tmp4_ = 0U;
-	gboolean _tmp6_ = FALSE;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	guint _tmp3_ = 0U;
+	gboolean _tmp5_ = FALSE;
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp1_ = self->priv->update_timeout;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_tmp1_ == ((guint) 0)) {
-#line 1387 "autosave-manager.c"
+#line 1414 "autosave-manager.c"
 		gboolean _tmp2_ = FALSE;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp2_ = do_timeout;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = _tmp2_;
-#line 1393 "autosave-manager.c"
+#line 1420 "autosave-manager.c"
 	} else {
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = FALSE;
-#line 1397 "autosave-manager.c"
+#line 1424 "autosave-manager.c"
 	}
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp3_ = _tmp0_;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp3_) {
 #line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_debug ("autosave-manager.vala:258: Waiting to autosave...");
-#line 1405 "autosave-manager.c"
+	if (_tmp0_) {
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_debug ("autosave-manager.vala:259: Waiting to autosave...");
+#line 1430 "autosave-manager.c"
 	}
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp4_ = self->priv->update_timeout;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp4_ > ((guint) 0)) {
-#line 1411 "autosave-manager.c"
-		guint _tmp5_ = 0U;
 #line 262 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp5_ = self->priv->update_timeout;
+	_tmp3_ = self->priv->update_timeout;
 #line 262 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_source_remove (_tmp5_);
-#line 1417 "autosave-manager.c"
-	}
+	if (_tmp3_ > ((guint) 0)) {
+#line 1436 "autosave-manager.c"
+		guint _tmp4_ = 0U;
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp4_ = self->priv->update_timeout;
 #line 263 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_source_remove (_tmp4_);
+#line 1442 "autosave-manager.c"
+	}
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->priv->update_timeout = (guint) 0;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp6_ = do_timeout;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp6_) {
-#line 1425 "autosave-manager.c"
-		guint _tmp7_ = 0U;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp7_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda2__gsource_func, autosave_manager_ref (self), autosave_manager_unref);
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		self->priv->update_timeout = _tmp7_;
-#line 1431 "autosave-manager.c"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp5_ = do_timeout;
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp5_) {
+#line 1450 "autosave-manager.c"
+		guint _tmp6_ = 0U;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp6_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda3__gsource_func, autosave_manager_ref (self), autosave_manager_unref);
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		self->priv->update_timeout = _tmp6_;
+#line 1456 "autosave-manager.c"
 	} else {
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_real_save (self);
-#line 1435 "autosave-manager.c"
+#line 1460 "autosave-manager.c"
 	}
 }
 
@@ -1442,626 +1467,572 @@ static void autosave_manager_real_save (AutosaveManager* self) {
 	GKeyFile* _tmp0_ = NULL;
 	gchar* page_names = NULL;
 	gchar* _tmp1_ = NULL;
-	GKeyFile* _tmp122_ = NULL;
-	const gchar* _tmp123_ = NULL;
+	GKeyFile* _tmp109_ = NULL;
+	const gchar* _tmp110_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_debug ("autosave-manager.vala:280: Autosaving book information");
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_debug ("autosave-manager.vala:281: Autosaving book information");
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = g_key_file_new ();
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	file = _tmp0_;
 #line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	file = _tmp0_;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp1_ = g_strdup ("");
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	page_names = _tmp1_;
-#line 1460 "autosave-manager.c"
+#line 1485 "autosave-manager.c"
 	{
 		gint i = 0;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		i = 0;
-#line 1465 "autosave-manager.c"
+#line 1490 "autosave-manager.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			_tmp2_ = TRUE;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			while (TRUE) {
-#line 1472 "autosave-manager.c"
-				gboolean _tmp3_ = FALSE;
-				gint _tmp5_ = 0;
+#line 1497 "autosave-manager.c"
+				gint _tmp4_ = 0;
+				Book* _tmp5_ = NULL;
 				Book* _tmp6_ = NULL;
-				Book* _tmp7_ = NULL;
+				guint _tmp7_ = 0U;
 				guint _tmp8_ = 0U;
-				guint _tmp9_ = 0U;
 				Page* page = NULL;
+				Book* _tmp9_ = NULL;
 				Book* _tmp10_ = NULL;
-				Book* _tmp11_ = NULL;
-				gint _tmp12_ = 0;
+				gint _tmp11_ = 0;
+				Page* _tmp12_ = NULL;
 				Page* _tmp13_ = NULL;
-				Page* _tmp14_ = NULL;
+				gboolean _tmp14_ = FALSE;
 				gboolean _tmp15_ = FALSE;
-				gboolean _tmp16_ = FALSE;
 				gchar* page_name = NULL;
-				gint _tmp17_ = 0;
-				gchar* _tmp18_ = NULL;
-				const gchar* _tmp19_ = NULL;
+				gint _tmp16_ = 0;
+				gchar* _tmp17_ = NULL;
+				const gchar* _tmp18_ = NULL;
+				const gchar* _tmp21_ = NULL;
 				const gchar* _tmp22_ = NULL;
-				const gchar* _tmp23_ = NULL;
-				gchar* _tmp24_ = NULL;
-				const gchar* _tmp25_ = NULL;
-				GKeyFile* _tmp26_ = NULL;
-				const gchar* _tmp27_ = NULL;
-				Page* _tmp28_ = NULL;
+				gchar* _tmp23_ = NULL;
+				const gchar* _tmp24_ = NULL;
+				GKeyFile* _tmp25_ = NULL;
+				const gchar* _tmp26_ = NULL;
+				Page* _tmp27_ = NULL;
+				gint _tmp28_ = 0;
 				gint _tmp29_ = 0;
-				gint _tmp30_ = 0;
-				GKeyFile* _tmp31_ = NULL;
-				const gchar* _tmp32_ = NULL;
-				Page* _tmp33_ = NULL;
+				GKeyFile* _tmp30_ = NULL;
+				const gchar* _tmp31_ = NULL;
+				Page* _tmp32_ = NULL;
+				gint _tmp33_ = 0;
 				gint _tmp34_ = 0;
-				gint _tmp35_ = 0;
-				GKeyFile* _tmp36_ = NULL;
-				const gchar* _tmp37_ = NULL;
-				Page* _tmp38_ = NULL;
+				GKeyFile* _tmp35_ = NULL;
+				const gchar* _tmp36_ = NULL;
+				Page* _tmp37_ = NULL;
+				gint _tmp38_ = 0;
 				gint _tmp39_ = 0;
-				gint _tmp40_ = 0;
-				GKeyFile* _tmp41_ = NULL;
-				const gchar* _tmp42_ = NULL;
-				Page* _tmp43_ = NULL;
+				GKeyFile* _tmp40_ = NULL;
+				const gchar* _tmp41_ = NULL;
+				Page* _tmp42_ = NULL;
+				gint _tmp43_ = 0;
 				gint _tmp44_ = 0;
-				gint _tmp45_ = 0;
-				GKeyFile* _tmp46_ = NULL;
-				const gchar* _tmp47_ = NULL;
-				Page* _tmp48_ = NULL;
+				GKeyFile* _tmp45_ = NULL;
+				const gchar* _tmp46_ = NULL;
+				Page* _tmp47_ = NULL;
+				gint _tmp48_ = 0;
 				gint _tmp49_ = 0;
-				gint _tmp50_ = 0;
-				GKeyFile* _tmp51_ = NULL;
-				const gchar* _tmp52_ = NULL;
-				Page* _tmp53_ = NULL;
+				GKeyFile* _tmp50_ = NULL;
+				const gchar* _tmp51_ = NULL;
+				Page* _tmp52_ = NULL;
+				gint _tmp53_ = 0;
 				gint _tmp54_ = 0;
-				gint _tmp55_ = 0;
-				Page* _tmp56_ = NULL;
+				Page* _tmp55_ = NULL;
+				ScanDirection _tmp56_ = 0;
 				ScanDirection _tmp57_ = 0;
-				ScanDirection _tmp58_ = 0;
-				gchar* _tmp67_ = NULL;
-				Page* _tmp68_ = NULL;
+				const gchar* _tmp66_ = NULL;
+				Page* _tmp67_ = NULL;
+				const gchar* _tmp68_ = NULL;
 				const gchar* _tmp69_ = NULL;
-				const gchar* _tmp70_ = NULL;
-				gchar* _tmp71_ = NULL;
+				GKeyFile* _tmp70_ = NULL;
+				const gchar* _tmp71_ = NULL;
 				const gchar* _tmp72_ = NULL;
-				GKeyFile* _tmp74_ = NULL;
-				const gchar* _tmp75_ = NULL;
-				const gchar* _tmp76_ = NULL;
-				gchar* _tmp77_ = NULL;
-				GHashTable* _tmp78_ = NULL;
-				Page* _tmp79_ = NULL;
-				gconstpointer _tmp80_ = NULL;
-				gchar* _tmp81_ = NULL;
-				const gchar* _tmp82_ = NULL;
-				GKeyFile* _tmp84_ = NULL;
+				GHashTable* _tmp73_ = NULL;
+				Page* _tmp74_ = NULL;
+				gconstpointer _tmp75_ = NULL;
+				GKeyFile* _tmp76_ = NULL;
+				const gchar* _tmp77_ = NULL;
+				GKeyFile* _tmp78_ = NULL;
+				const gchar* _tmp79_ = NULL;
+				Page* _tmp80_ = NULL;
+				gboolean _tmp81_ = FALSE;
+				gboolean _tmp82_ = FALSE;
+				const gchar* _tmp83_ = NULL;
+				Page* _tmp84_ = NULL;
 				const gchar* _tmp85_ = NULL;
 				const gchar* _tmp86_ = NULL;
 				GKeyFile* _tmp87_ = NULL;
 				const gchar* _tmp88_ = NULL;
-				Page* _tmp89_ = NULL;
-				gboolean _tmp90_ = FALSE;
-				gboolean _tmp91_ = FALSE;
-				gchar* _tmp92_ = NULL;
-				Page* _tmp93_ = NULL;
-				const gchar* _tmp94_ = NULL;
+				GKeyFile* _tmp89_ = NULL;
+				const gchar* _tmp90_ = NULL;
+				Page* _tmp91_ = NULL;
+				gint _tmp92_ = 0;
+				gint _tmp93_ = 0;
+				GKeyFile* _tmp94_ = NULL;
 				const gchar* _tmp95_ = NULL;
-				gchar* _tmp96_ = NULL;
-				const gchar* _tmp97_ = NULL;
+				Page* _tmp96_ = NULL;
+				gint _tmp97_ = 0;
+				gint _tmp98_ = 0;
 				GKeyFile* _tmp99_ = NULL;
 				const gchar* _tmp100_ = NULL;
-				const gchar* _tmp101_ = NULL;
-				GKeyFile* _tmp102_ = NULL;
-				const gchar* _tmp103_ = NULL;
-				Page* _tmp104_ = NULL;
-				gint _tmp105_ = 0;
-				gint _tmp106_ = 0;
-				GKeyFile* _tmp107_ = NULL;
-				const gchar* _tmp108_ = NULL;
-				Page* _tmp109_ = NULL;
-				gint _tmp110_ = 0;
-				gint _tmp111_ = 0;
-				GKeyFile* _tmp112_ = NULL;
-				const gchar* _tmp113_ = NULL;
-				Page* _tmp114_ = NULL;
-				gint _tmp115_ = 0;
-				gint _tmp116_ = 0;
-				GKeyFile* _tmp117_ = NULL;
-				const gchar* _tmp118_ = NULL;
-				Page* _tmp119_ = NULL;
-				gint _tmp120_ = 0;
-				gint _tmp121_ = 0;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp3_ = _tmp2_;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!_tmp3_) {
-#line 1584 "autosave-manager.c"
-					gint _tmp4_ = 0;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp4_ = i;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					i = _tmp4_ + 1;
-#line 1590 "autosave-manager.c"
+				Page* _tmp101_ = NULL;
+				gint _tmp102_ = 0;
+				gint _tmp103_ = 0;
+				GKeyFile* _tmp104_ = NULL;
+				const gchar* _tmp105_ = NULL;
+				Page* _tmp106_ = NULL;
+				gint _tmp107_ = 0;
+				gint _tmp108_ = 0;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (!_tmp2_) {
+#line 1597 "autosave-manager.c"
+					gint _tmp3_ = 0;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp3_ = i;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					i = _tmp3_ + 1;
+#line 1603 "autosave-manager.c"
 				}
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp2_ = FALSE;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp5_ = i;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp6_ = autosave_manager_get_book (self);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp7_ = _tmp6_;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp8_ = book_get_n_pages (_tmp7_);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp9_ = _tmp8_;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!(((guint) _tmp5_) < _tmp9_)) {
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp4_ = i;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp5_ = autosave_manager_get_book (self);
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp6_ = _tmp5_;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp7_ = book_get_n_pages (_tmp6_);
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp8_ = _tmp7_;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (!(((guint) _tmp4_) < _tmp8_)) {
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					break;
-#line 1608 "autosave-manager.c"
+#line 1621 "autosave-manager.c"
 				}
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp10_ = autosave_manager_get_book (self);
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp11_ = _tmp10_;
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp12_ = i;
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp13_ = book_get_page (_tmp11_, _tmp12_);
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				page = _tmp13_;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp14_ = page;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp15_ = page_get_has_data (_tmp14_);
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp16_ = _tmp15_;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!_tmp16_) {
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp9_ = autosave_manager_get_book (self);
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp10_ = _tmp9_;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp11_ = i;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp12_ = book_get_page (_tmp10_, _tmp11_);
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				page = _tmp12_;
 #line 290 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_page_unref0 (page);
+				_tmp13_ = page;
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp14_ = page_get_has_data (_tmp13_);
 #line 290 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp15_ = _tmp14_;
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (!_tmp15_) {
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_page_unref0 (page);
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					continue;
-#line 1632 "autosave-manager.c"
+#line 1645 "autosave-manager.c"
 				}
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp17_ = i;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp18_ = g_strdup_printf ("page-%d", _tmp17_);
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				page_name = _tmp18_;
 #line 293 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp19_ = page_names;
+				_tmp16_ = i;
 #line 293 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (g_strcmp0 (_tmp19_, "") != 0) {
-#line 1644 "autosave-manager.c"
-					const gchar* _tmp20_ = NULL;
-					gchar* _tmp21_ = NULL;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp20_ = page_names;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp21_ = g_strconcat (_tmp20_, " ", NULL);
+				_tmp17_ = g_strdup_printf ("page-%d", _tmp16_);
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				page_name = _tmp17_;
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (page_names);
+				_tmp18_ = page_names;
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					page_names = _tmp21_;
-#line 1655 "autosave-manager.c"
-				}
+				if (g_strcmp0 (_tmp18_, "") != 0) {
+#line 1657 "autosave-manager.c"
+					const gchar* _tmp19_ = NULL;
+					gchar* _tmp20_ = NULL;
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp22_ = page_names;
+					_tmp19_ = page_names;
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp23_ = page_name;
+					_tmp20_ = g_strconcat (_tmp19_, " ", NULL);
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp24_ = g_strconcat (_tmp22_, _tmp23_, NULL);
+					_g_free0 (page_names);
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					page_names = _tmp20_;
+#line 1668 "autosave-manager.c"
+				}
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp21_ = page_names;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp22_ = page_name;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp23_ = g_strconcat (_tmp21_, _tmp22_, NULL);
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (page_names);
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				page_names = _tmp24_;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp25_ = page_name;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_debug ("autosave-manager.vala:297: Autosaving page %s", _tmp25_);
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp26_ = file;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp27_ = page_name;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp28_ = page;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp29_ = page_get_scan_width (_tmp28_);
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp30_ = _tmp29_;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp26_, _tmp27_, "scan-width", _tmp30_);
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				page_names = _tmp23_;
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp24_ = page_name;
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_debug ("autosave-manager.vala:298: Autosaving page %s", _tmp24_);
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp31_ = file;
+				_tmp25_ = file;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp32_ = page_name;
+				_tmp26_ = page_name;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp33_ = page;
+				_tmp27_ = page;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp34_ = page_get_scan_height (_tmp33_);
+				_tmp28_ = page_get_scan_width (_tmp27_);
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp35_ = _tmp34_;
+				_tmp29_ = _tmp28_;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp31_, _tmp32_, "scan-height", _tmp35_);
+				g_key_file_set_integer (_tmp25_, _tmp26_, "scan-width", _tmp29_);
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp36_ = file;
+				_tmp30_ = file;
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp37_ = page_name;
+				_tmp31_ = page_name;
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp38_ = page;
+				_tmp32_ = page;
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp39_ = page_get_rowstride (_tmp38_);
+				_tmp33_ = page_get_scan_height (_tmp32_);
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp40_ = _tmp39_;
+				_tmp34_ = _tmp33_;
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp36_, _tmp37_, "rowstride", _tmp40_);
+				g_key_file_set_integer (_tmp30_, _tmp31_, "scan-height", _tmp34_);
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp41_ = file;
+				_tmp35_ = file;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp42_ = page_name;
+				_tmp36_ = page_name;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp43_ = page;
+				_tmp37_ = page;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp44_ = page_get_n_channels (_tmp43_);
+				_tmp38_ = page_get_rowstride (_tmp37_);
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp45_ = _tmp44_;
+				_tmp39_ = _tmp38_;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp41_, _tmp42_, "n-channels", _tmp45_);
+				g_key_file_set_integer (_tmp35_, _tmp36_, "rowstride", _tmp39_);
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp46_ = file;
+				_tmp40_ = file;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp47_ = page_name;
+				_tmp41_ = page_name;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp48_ = page;
+				_tmp42_ = page;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp49_ = page_get_depth (_tmp48_);
+				_tmp43_ = page_get_n_channels (_tmp42_);
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp50_ = _tmp49_;
+				_tmp44_ = _tmp43_;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp46_, _tmp47_, "depth", _tmp50_);
+				g_key_file_set_integer (_tmp40_, _tmp41_, "n-channels", _tmp44_);
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp51_ = file;
+				_tmp45_ = file;
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp52_ = page_name;
+				_tmp46_ = page_name;
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp53_ = page;
+				_tmp47_ = page;
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp54_ = page_get_dpi (_tmp53_);
+				_tmp48_ = page_get_depth (_tmp47_);
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp55_ = _tmp54_;
+				_tmp49_ = _tmp48_;
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp51_, _tmp52_, "dpi", _tmp55_);
+				g_key_file_set_integer (_tmp45_, _tmp46_, "depth", _tmp49_);
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp50_ = file;
 #line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp56_ = page;
+				_tmp51_ = page_name;
 #line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp57_ = page_get_scan_direction (_tmp56_);
+				_tmp52_ = page;
 #line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp58_ = _tmp57_;
+				_tmp53_ = page_get_dpi (_tmp52_);
 #line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				switch (_tmp58_) {
+				_tmp54_ = _tmp53_;
 #line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_integer (_tmp50_, _tmp51_, "dpi", _tmp54_);
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp55_ = page;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp56_ = page_get_scan_direction (_tmp55_);
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp57_ = _tmp56_;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				switch (_tmp57_) {
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 1753 "autosave-manager.c"
+#line 1766 "autosave-manager.c"
 					{
-						GKeyFile* _tmp59_ = NULL;
-						const gchar* _tmp60_ = NULL;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp59_ = file;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp60_ = page_name;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_key_file_set_value (_tmp59_, _tmp60_, "scan-direction", "TOP_TO_BOTTOM");
+						GKeyFile* _tmp58_ = NULL;
+						const gchar* _tmp59_ = NULL;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp58_ = file;
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp59_ = page_name;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_key_file_set_value (_tmp58_, _tmp59_, "scan-direction", "TOP_TO_BOTTOM");
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						break;
-#line 1765 "autosave-manager.c"
+#line 1778 "autosave-manager.c"
 					}
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 1769 "autosave-manager.c"
+#line 1782 "autosave-manager.c"
 					{
-						GKeyFile* _tmp61_ = NULL;
-						const gchar* _tmp62_ = NULL;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp61_ = file;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp62_ = page_name;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_key_file_set_value (_tmp61_, _tmp62_, "scan-direction", "LEFT_TO_RIGHT");
+						GKeyFile* _tmp60_ = NULL;
+						const gchar* _tmp61_ = NULL;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp60_ = file;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp61_ = page_name;
 #line 312 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_key_file_set_value (_tmp60_, _tmp61_, "scan-direction", "LEFT_TO_RIGHT");
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						break;
-#line 1781 "autosave-manager.c"
+#line 1794 "autosave-manager.c"
 					}
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 1785 "autosave-manager.c"
+#line 1798 "autosave-manager.c"
 					{
-						GKeyFile* _tmp63_ = NULL;
-						const gchar* _tmp64_ = NULL;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp63_ = file;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp64_ = page_name;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_key_file_set_value (_tmp63_, _tmp64_, "scan-direction", "BOTTOM_TO_TOP");
+						GKeyFile* _tmp62_ = NULL;
+						const gchar* _tmp63_ = NULL;
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp62_ = file;
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp63_ = page_name;
 #line 315 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_key_file_set_value (_tmp62_, _tmp63_, "scan-direction", "BOTTOM_TO_TOP");
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						break;
-#line 1797 "autosave-manager.c"
+#line 1810 "autosave-manager.c"
 					}
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 1801 "autosave-manager.c"
+#line 1814 "autosave-manager.c"
 					{
-						GKeyFile* _tmp65_ = NULL;
-						const gchar* _tmp66_ = NULL;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp65_ = file;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp66_ = page_name;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_key_file_set_value (_tmp65_, _tmp66_, "scan-direction", "RIGHT_TO_LEFT");
+						GKeyFile* _tmp64_ = NULL;
+						const gchar* _tmp65_ = NULL;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp64_ = file;
 #line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp65_ = page_name;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_key_file_set_value (_tmp64_, _tmp65_, "scan-direction", "RIGHT_TO_LEFT");
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						break;
-#line 1813 "autosave-manager.c"
+#line 1826 "autosave-manager.c"
 					}
 					default:
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					break;
-#line 1818 "autosave-manager.c"
+#line 1831 "autosave-manager.c"
 				}
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp68_ = page;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp69_ = page_get_color_profile (_tmp68_);
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp70_ = _tmp69_;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp71_ = g_strdup (_tmp70_);
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp67_ = _tmp71_;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp72_ = _tmp67_;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (_tmp72_ == NULL) {
-#line 1834 "autosave-manager.c"
-					gchar* _tmp73_ = NULL;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp73_ = g_strdup ("");
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (_tmp67_);
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp67_ = _tmp73_;
-#line 1842 "autosave-manager.c"
-				}
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp74_ = file;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp75_ = page_name;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp76_ = _tmp67_;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_value (_tmp74_, _tmp75_, "color-profile", _tmp76_);
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp78_ = self->priv->page_filenames;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp79_ = page;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp80_ = g_hash_table_lookup (_tmp78_, _tmp79_);
+				_tmp67_ = page;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp81_ = g_strdup ((const gchar*) _tmp80_);
+				_tmp68_ = page_get_color_profile (_tmp67_);
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp77_ = _tmp81_;
+				_tmp69_ = _tmp68_;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp82_ = _tmp77_;
+				_tmp66_ = _tmp69_;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (_tmp82_ == NULL) {
-#line 1866 "autosave-manager.c"
-					gchar* _tmp83_ = NULL;
+				if (_tmp66_ == NULL) {
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp83_ = g_strdup ("");
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (_tmp77_);
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp77_ = _tmp83_;
-#line 1874 "autosave-manager.c"
+					_tmp66_ = "";
+#line 1845 "autosave-manager.c"
 				}
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp84_ = file;
+				_tmp70_ = file;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp85_ = page_name;
+				_tmp71_ = page_name;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp86_ = _tmp77_;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_value (_tmp84_, _tmp85_, "pixels-filename", _tmp86_);
+				g_key_file_set_value (_tmp70_, _tmp71_, "color-profile", _tmp66_);
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp87_ = file;
+				_tmp73_ = self->priv->page_filenames;
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp88_ = page_name;
+				_tmp74_ = page;
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp89_ = page;
+				_tmp75_ = g_hash_table_lookup (_tmp73_, _tmp74_);
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp90_ = page_get_has_crop (_tmp89_);
+				_tmp72_ = (const gchar*) _tmp75_;
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp91_ = _tmp90_;
+				if (_tmp72_ == NULL) {
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_boolean (_tmp87_, _tmp88_, "has-crop", _tmp91_);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp93_ = page;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp94_ = page_get_crop_name (_tmp93_);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp95_ = _tmp94_;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp96_ = g_strdup (_tmp95_);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp92_ = _tmp96_;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp97_ = _tmp92_;
+					_tmp72_ = "";
+#line 1865 "autosave-manager.c"
+				}
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp76_ = file;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp77_ = page_name;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_value (_tmp76_, _tmp77_, "pixels-filename", _tmp72_);
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (_tmp97_ == NULL) {
-#line 1910 "autosave-manager.c"
-					gchar* _tmp98_ = NULL;
+				_tmp78_ = file;
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp98_ = g_strdup ("");
+				_tmp79_ = page_name;
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (_tmp92_);
+				_tmp80_ = page;
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp92_ = _tmp98_;
-#line 1918 "autosave-manager.c"
-				}
+				_tmp81_ = page_get_has_crop (_tmp80_);
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp99_ = file;
+				_tmp82_ = _tmp81_;
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp100_ = page_name;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp101_ = _tmp92_;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_value (_tmp99_, _tmp100_, "crop-name", _tmp101_);
+				g_key_file_set_boolean (_tmp78_, _tmp79_, "has-crop", _tmp82_);
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp84_ = page;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp85_ = page_get_crop_name (_tmp84_);
 #line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp102_ = file;
+				_tmp86_ = _tmp85_;
 #line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp103_ = page_name;
+				_tmp83_ = _tmp86_;
 #line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp104_ = page;
+				if (_tmp83_ == NULL) {
 #line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp105_ = page_get_crop_x (_tmp104_);
+					_tmp83_ = "";
+#line 1897 "autosave-manager.c"
+				}
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp87_ = file;
 #line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp106_ = _tmp105_;
+				_tmp88_ = page_name;
 #line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp102_, _tmp103_, "crop-x", _tmp106_);
+				g_key_file_set_value (_tmp87_, _tmp88_, "crop-name", _tmp83_);
 #line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp107_ = file;
+				_tmp89_ = file;
 #line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp108_ = page_name;
+				_tmp90_ = page_name;
 #line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp109_ = page;
+				_tmp91_ = page;
 #line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp110_ = page_get_crop_y (_tmp109_);
+				_tmp92_ = page_get_crop_x (_tmp91_);
 #line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp111_ = _tmp110_;
+				_tmp93_ = _tmp92_;
 #line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp107_, _tmp108_, "crop-y", _tmp111_);
+				g_key_file_set_integer (_tmp89_, _tmp90_, "crop-x", _tmp93_);
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp112_ = file;
+				_tmp94_ = file;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp113_ = page_name;
+				_tmp95_ = page_name;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp114_ = page;
+				_tmp96_ = page;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp115_ = page_get_crop_width (_tmp114_);
+				_tmp97_ = page_get_crop_y (_tmp96_);
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp116_ = _tmp115_;
+				_tmp98_ = _tmp97_;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp112_, _tmp113_, "crop-width", _tmp116_);
+				g_key_file_set_integer (_tmp94_, _tmp95_, "crop-y", _tmp98_);
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp117_ = file;
+				_tmp99_ = file;
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp118_ = page_name;
+				_tmp100_ = page_name;
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp119_ = page;
+				_tmp101_ = page;
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp120_ = page_get_crop_height (_tmp119_);
+				_tmp102_ = page_get_crop_width (_tmp101_);
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp121_ = _tmp120_;
+				_tmp103_ = _tmp102_;
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp117_, _tmp118_, "crop-height", _tmp121_);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_g_free0 (_tmp92_);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_g_free0 (_tmp77_);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_g_free0 (_tmp67_);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_integer (_tmp99_, _tmp100_, "crop-width", _tmp103_);
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp104_ = file;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp105_ = page_name;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp106_ = page;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp107_ = page_get_crop_height (_tmp106_);
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp108_ = _tmp107_;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_integer (_tmp104_, _tmp105_, "crop-height", _tmp108_);
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (page_name);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_page_unref0 (page);
-#line 1986 "autosave-manager.c"
+#line 1957 "autosave-manager.c"
 			}
 		}
 	}
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp122_ = file;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp123_ = page_names;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_key_file_set_value (_tmp122_, "simple-scan", "pages", _tmp123_);
-#line 1996 "autosave-manager.c"
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp109_ = file;
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp110_ = page_names;
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_key_file_set_value (_tmp109_, "simple-scan", "pages", _tmp110_);
+#line 1967 "autosave-manager.c"
 	{
-		const gchar* _tmp124_ = NULL;
-		const gchar* _tmp125_ = NULL;
-		GKeyFile* _tmp126_ = NULL;
-		gchar* _tmp127_ = NULL;
-		gchar* _tmp128_ = NULL;
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp124_ = autosave_manager_AUTOSAVE_DIR;
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_mkdir_with_parents (_tmp124_, 0777);
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp125_ = autosave_manager_AUTOSAVE_PATH;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp126_ = file;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp127_ = g_key_file_to_data (_tmp126_, NULL, NULL);
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp128_ = _tmp127_;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_file_set_contents (_tmp125_, _tmp128_, (gssize) (-1), &_inner_error_);
+		const gchar* _tmp111_ = NULL;
+		const gchar* _tmp112_ = NULL;
+		GKeyFile* _tmp113_ = NULL;
+		gchar* _tmp114_ = NULL;
+		gchar* _tmp115_ = NULL;
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (_tmp128_);
+		_tmp111_ = autosave_manager_AUTOSAVE_DIR;
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_mkdir_with_parents (_tmp111_, 0777);
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp112_ = autosave_manager_AUTOSAVE_PATH;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp113_ = file;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp114_ = g_key_file_to_data (_tmp113_, NULL, NULL);
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp115_ = _tmp114_;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_file_set_contents (_tmp112_, _tmp115_, (gssize) (-1), &_inner_error_);
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (_tmp115_);
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (_inner_error_ != NULL) {
-#line 2021 "autosave-manager.c"
-			goto __catch34_g_error;
+#line 1992 "autosave-manager.c"
+			goto __catch33_g_error;
 		}
 	}
-	goto __finally34;
-	__catch34_g_error:
+	goto __finally33;
+	__catch33_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp129_ = NULL;
-		const gchar* _tmp130_ = NULL;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		GError* _tmp116_ = NULL;
+		const gchar* _tmp117_ = NULL;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp129_ = e;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp130_ = _tmp129_->message;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:338: Failed to write autosave: %s", _tmp130_);
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp116_ = e;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp117_ = _tmp116_->message;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:339: Failed to write autosave: %s", _tmp117_);
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_error_free0 (e);
-#line 2043 "autosave-manager.c"
+#line 2014 "autosave-manager.c"
 	}
-	__finally34:
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	__finally33:
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_inner_error_ != NULL) {
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (page_names);
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_key_file_unref0 (file);
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 332 "/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 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_clear_error (&_inner_error_);
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
-#line 2058 "autosave-manager.c"
+#line 2029 "autosave-manager.c"
 	}
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_free0 (page_names);
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_key_file_unref0 (file);
-#line 2064 "autosave-manager.c"
+#line 2035 "autosave-manager.c"
 }
 
 
@@ -2081,103 +2052,103 @@ static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) {
 	GFile* file = NULL;
 	GFile* _tmp10_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (page != NULL);
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = g_direct_hash;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp1_ = page;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp2_ = _tmp0_ (_tmp1_);
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp3_ = g_strdup_printf ("%u.pixels", _tmp2_);
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	filename = _tmp3_;
 #line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	filename = _tmp3_;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp4_ = autosave_manager_AUTOSAVE_DIR;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp5_ = g_build_filename (_tmp4_, filename, NULL);
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	path = _tmp5_;
 #line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	path = _tmp5_;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp6_ = self->priv->page_filenames;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp7_ = page;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp8_ = _page_ref0 (_tmp7_);
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp9_ = g_strdup (filename);
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_hash_table_insert (_tmp6_, _tmp8_, _tmp9_);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_debug ("autosave-manager.vala:348: Autosaving page pixels to %s", path);
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_debug ("autosave-manager.vala:349: Autosaving page pixels to %s", path);
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp10_ = g_file_new_for_path (path);
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	file = _tmp10_;
-#line 2120 "autosave-manager.c"
+#line 2091 "autosave-manager.c"
 	{
 		Page* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
 		guchar* _tmp13_ = NULL;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp11_ = page;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp13_ = page_get_pixels (_tmp11_, &_tmp12_);
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_file_replace_contents (file, _tmp13_, (gsize) _tmp12_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL, &_inner_error_);
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (_inner_error_ != NULL) {
-#line 2133 "autosave-manager.c"
-			goto __catch35_g_error;
+#line 2104 "autosave-manager.c"
+			goto __catch34_g_error;
 		}
 	}
-	goto __finally35;
-	__catch35_g_error:
+	goto __finally34;
+	__catch34_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp14_ = NULL;
 		const gchar* _tmp15_ = NULL;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp14_ = e;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp15_ = _tmp14_->message;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:357: Failed to autosave page contents: %s", _tmp15_);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:358: Failed to autosave page contents: %s", _tmp15_);
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_error_free0 (e);
-#line 2155 "autosave-manager.c"
+#line 2126 "autosave-manager.c"
 	}
-	__finally35:
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	__finally34:
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_inner_error_ != NULL) {
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_object_unref0 (file);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (path);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (filename);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 352 "/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 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_clear_error (&_inner_error_);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
-#line 2172 "autosave-manager.c"
+#line 2143 "autosave-manager.c"
 	}
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_object_unref0 (file);
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_free0 (path);
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_free0 (filename);
-#line 2180 "autosave-manager.c"
+#line 2151 "autosave-manager.c"
 }
 
 
@@ -2192,252 +2163,246 @@ Book* autosave_manager_get_book (AutosaveManager* self) {
 	result = _tmp0_;
 #line 28 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return result;
-#line 2195 "autosave-manager.c"
+#line 2166 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_page_added_book_page_added (Book* _sender, Page* page, gpointer self) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_page_added (self, page);
-#line 2202 "autosave-manager.c"
+	autosave_manager_on_page_added ((AutosaveManager*) self, page);
+#line 2173 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_page_removed_book_page_removed (Book* _sender, Page* page, gpointer self) {
 #line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_page_removed (self, page);
-#line 2209 "autosave-manager.c"
+	autosave_manager_on_page_removed ((AutosaveManager*) self, page);
+#line 2180 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_changed_book_reordered (Book* _sender, gpointer self) {
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_changed (self);
-#line 2216 "autosave-manager.c"
+	autosave_manager_on_changed ((AutosaveManager*) self);
+#line 2187 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_cleared_book_cleared (Book* _sender, gpointer self) {
 #line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_cleared (self);
-#line 2223 "autosave-manager.c"
+	autosave_manager_on_cleared ((AutosaveManager*) self);
+#line 2194 "autosave-manager.c"
 }
 
 
 static gpointer _book_ref0 (gpointer self) {
 #line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return self ? book_ref (self) : NULL;
-#line 2230 "autosave-manager.c"
+#line 2201 "autosave-manager.c"
 }
 
 
 void autosave_manager_set_book (AutosaveManager* self, Book* value) {
 	Book* _tmp0_ = NULL;
+	Book* _tmp19_ = NULL;
 	Book* _tmp20_ = NULL;
 	Book* _tmp21_ = NULL;
 	Book* _tmp22_ = NULL;
 	Book* _tmp23_ = NULL;
 	Book* _tmp24_ = NULL;
-	Book* _tmp25_ = NULL;
 #line 30 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
 #line 32 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = self->priv->book_;
 #line 32 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_tmp0_ != NULL) {
-#line 2248 "autosave-manager.c"
-		Book* _tmp12_ = NULL;
-		guint _tmp13_ = 0U;
-		Book* _tmp14_ = NULL;
-		guint _tmp15_ = 0U;
-		Book* _tmp16_ = NULL;
-		guint _tmp17_ = 0U;
-		Book* _tmp18_ = NULL;
-		guint _tmp19_ = 0U;
+#line 2219 "autosave-manager.c"
+		Book* _tmp11_ = NULL;
+		guint _tmp12_ = 0U;
+		Book* _tmp13_ = NULL;
+		guint _tmp14_ = 0U;
+		Book* _tmp15_ = NULL;
+		guint _tmp16_ = 0U;
+		Book* _tmp17_ = NULL;
+		guint _tmp18_ = 0U;
 		{
 			gint i = 0;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			i = 0;
-#line 2261 "autosave-manager.c"
+#line 2232 "autosave-manager.c"
 			{
 				gboolean _tmp1_ = FALSE;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp1_ = TRUE;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				while (TRUE) {
-#line 2268 "autosave-manager.c"
-					gboolean _tmp2_ = FALSE;
-					gint _tmp4_ = 0;
-					Book* _tmp5_ = NULL;
+#line 2239 "autosave-manager.c"
+					gint _tmp3_ = 0;
+					Book* _tmp4_ = NULL;
+					guint _tmp5_ = 0U;
 					guint _tmp6_ = 0U;
-					guint _tmp7_ = 0U;
 					Page* page = NULL;
-					Book* _tmp8_ = NULL;
-					gint _tmp9_ = 0;
+					Book* _tmp7_ = NULL;
+					gint _tmp8_ = 0;
+					Page* _tmp9_ = NULL;
 					Page* _tmp10_ = NULL;
-					Page* _tmp11_ = NULL;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp2_ = _tmp1_;
+					if (!_tmp1_) {
+#line 2251 "autosave-manager.c"
+						gint _tmp2_ = 0;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					if (!_tmp2_) {
-#line 2283 "autosave-manager.c"
-						gint _tmp3_ = 0;
+						_tmp2_ = i;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp3_ = i;
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						i = _tmp3_ + 1;
-#line 2289 "autosave-manager.c"
+						i = _tmp2_ + 1;
+#line 2257 "autosave-manager.c"
 					}
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp1_ = FALSE;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp4_ = i;
+					_tmp3_ = i;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp5_ = self->priv->book_;
+					_tmp4_ = self->priv->book_;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp6_ = book_get_n_pages (_tmp5_);
+					_tmp5_ = book_get_n_pages (_tmp4_);
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp7_ = _tmp6_;
+					_tmp6_ = _tmp5_;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					if (!(((guint) _tmp4_) < _tmp7_)) {
+					if (!(((guint) _tmp3_) < _tmp6_)) {
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						break;
-#line 2305 "autosave-manager.c"
+#line 2273 "autosave-manager.c"
 					}
 #line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp8_ = self->priv->book_;
+					_tmp7_ = self->priv->book_;
 #line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp9_ = i;
+					_tmp8_ = i;
 #line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp10_ = book_get_page (_tmp8_, _tmp9_);
+					_tmp9_ = book_get_page (_tmp7_, _tmp8_);
 #line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					page = _tmp10_;
+					page = _tmp9_;
 #line 37 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp11_ = page;
+					_tmp10_ = page;
 #line 37 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					autosave_manager_on_page_removed (self, _tmp11_);
+					autosave_manager_on_page_removed (self, _tmp10_);
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_page_unref0 (page);
-#line 2321 "autosave-manager.c"
+#line 2289 "autosave-manager.c"
 				}
 			}
 		}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp12_ = self->priv->book_;
+		_tmp11_ = self->priv->book_;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp13_, NULL, FALSE);
+		g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp12_, NULL, FALSE);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _autosave_manager_on_page_added_book_page_added, self);
+		g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _autosave_manager_on_page_added_book_page_added, self);
 #line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp14_ = self->priv->book_;
+		_tmp13_ = self->priv->book_;
 #line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp15_, NULL, FALSE);
+		g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp14_, NULL, FALSE);
 #line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_handlers_disconnect_matched (_tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _autosave_manager_on_page_removed_book_page_removed, self);
+		g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _autosave_manager_on_page_removed_book_page_removed, self);
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp16_ = self->priv->book_;
+		_tmp15_ = self->priv->book_;
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_parse_name ("reordered", TYPE_BOOK, &_tmp17_, NULL, FALSE);
+		g_signal_parse_name ("reordered", TYPE_BOOK, &_tmp16_, NULL, FALSE);
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_handlers_disconnect_matched (_tmp16_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _autosave_manager_on_changed_book_reordered, self);
+		g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _autosave_manager_on_changed_book_reordered, self);
 #line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp18_ = self->priv->book_;
+		_tmp17_ = self->priv->book_;
 #line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_parse_name ("cleared", TYPE_BOOK, &_tmp19_, NULL, FALSE);
+		g_signal_parse_name ("cleared", TYPE_BOOK, &_tmp18_, NULL, FALSE);
 #line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_handlers_disconnect_matched (_tmp18_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp19_, 0, NULL, (GCallback) _autosave_manager_on_cleared_book_cleared, self);
-#line 2349 "autosave-manager.c"
+		g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _autosave_manager_on_cleared_book_cleared, self);
+#line 2317 "autosave-manager.c"
 	}
 #line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp20_ = value;
+	_tmp19_ = value;
 #line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp21_ = _book_ref0 (_tmp20_);
+	_tmp20_ = _book_ref0 (_tmp19_);
 #line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_book_unref0 (self->priv->book_);
 #line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv->book_ = _tmp21_;
+	self->priv->book_ = _tmp20_;
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp22_ = self->priv->book_;
+	_tmp21_ = self->priv->book_;
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp22_, "page-added", (GCallback) _autosave_manager_on_page_added_book_page_added, self);
+	g_signal_connect (_tmp21_, "page-added", (GCallback) _autosave_manager_on_page_added_book_page_added, self);
 #line 46 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp23_ = self->priv->book_;
+	_tmp22_ = self->priv->book_;
 #line 46 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp23_, "page-removed", (GCallback) _autosave_manager_on_page_removed_book_page_removed, self);
+	g_signal_connect (_tmp22_, "page-removed", (GCallback) _autosave_manager_on_page_removed_book_page_removed, self);
 #line 47 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp24_ = self->priv->book_;
+	_tmp23_ = self->priv->book_;
 #line 47 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp24_, "reordered", (GCallback) _autosave_manager_on_changed_book_reordered, self);
+	g_signal_connect (_tmp23_, "reordered", (GCallback) _autosave_manager_on_changed_book_reordered, self);
 #line 48 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp25_ = self->priv->book_;
+	_tmp24_ = self->priv->book_;
 #line 48 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp25_, "cleared", (GCallback) _autosave_manager_on_cleared_book_cleared, self);
-#line 2375 "autosave-manager.c"
+	g_signal_connect (_tmp24_, "cleared", (GCallback) _autosave_manager_on_cleared_book_cleared, self);
+#line 2343 "autosave-manager.c"
 	{
 		gint i = 0;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		i = 0;
-#line 2380 "autosave-manager.c"
+#line 2348 "autosave-manager.c"
 		{
-			gboolean _tmp26_ = FALSE;
+			gboolean _tmp25_ = FALSE;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp26_ = TRUE;
+			_tmp25_ = TRUE;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			while (TRUE) {
-#line 2387 "autosave-manager.c"
-				gboolean _tmp27_ = FALSE;
-				gint _tmp29_ = 0;
-				Book* _tmp30_ = NULL;
-				guint _tmp31_ = 0U;
-				guint _tmp32_ = 0U;
+#line 2355 "autosave-manager.c"
+				gint _tmp27_ = 0;
+				Book* _tmp28_ = NULL;
+				guint _tmp29_ = 0U;
+				guint _tmp30_ = 0U;
 				Page* page = NULL;
-				Book* _tmp33_ = NULL;
-				gint _tmp34_ = 0;
-				Page* _tmp35_ = NULL;
-				Page* _tmp36_ = NULL;
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp27_ = _tmp26_;
+				Book* _tmp31_ = NULL;
+				gint _tmp32_ = 0;
+				Page* _tmp33_ = NULL;
+				Page* _tmp34_ = NULL;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!_tmp27_) {
-#line 2402 "autosave-manager.c"
-					gint _tmp28_ = 0;
+				if (!_tmp25_) {
+#line 2367 "autosave-manager.c"
+					gint _tmp26_ = 0;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp28_ = i;
+					_tmp26_ = i;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					i = _tmp28_ + 1;
-#line 2408 "autosave-manager.c"
+					i = _tmp26_ + 1;
+#line 2373 "autosave-manager.c"
 				}
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp26_ = FALSE;
+				_tmp25_ = FALSE;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp29_ = i;
+				_tmp27_ = i;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp30_ = self->priv->book_;
+				_tmp28_ = self->priv->book_;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp31_ = book_get_n_pages (_tmp30_);
+				_tmp29_ = book_get_n_pages (_tmp28_);
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp32_ = _tmp31_;
+				_tmp30_ = _tmp29_;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!(((guint) _tmp29_) < _tmp32_)) {
+				if (!(((guint) _tmp27_) < _tmp30_)) {
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					break;
-#line 2424 "autosave-manager.c"
+#line 2389 "autosave-manager.c"
 				}
 #line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp33_ = self->priv->book_;
+				_tmp31_ = self->priv->book_;
 #line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp34_ = i;
+				_tmp32_ = i;
 #line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp35_ = book_get_page (_tmp33_, _tmp34_);
+				_tmp33_ = book_get_page (_tmp31_, _tmp32_);
 #line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				page = _tmp35_;
+				page = _tmp33_;
 #line 52 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp36_ = page;
+				_tmp34_ = page;
 #line 52 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				autosave_manager_on_page_added (self, _tmp36_);
+				autosave_manager_on_page_added (self, _tmp34_);
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_page_unref0 (page);
-#line 2440 "autosave-manager.c"
+#line 2405 "autosave-manager.c"
 			}
 		}
 	}
@@ -2447,7 +2412,7 @@ void autosave_manager_set_book (AutosaveManager* self, Book* value) {
 static void value_autosave_manager_init (GValue* value) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	value->data[0].v_pointer = NULL;
-#line 2450 "autosave-manager.c"
+#line 2415 "autosave-manager.c"
 }
 
 
@@ -2456,7 +2421,7 @@ static void value_autosave_manager_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_unref (value->data[0].v_pointer);
-#line 2459 "autosave-manager.c"
+#line 2424 "autosave-manager.c"
 	}
 }
 
@@ -2466,11 +2431,11 @@ static void value_autosave_manager_copy_value (const GValue* src_value, GValue*
 	if (src_value->data[0].v_pointer) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		dest_value->data[0].v_pointer = autosave_manager_ref (src_value->data[0].v_pointer);
-#line 2469 "autosave-manager.c"
+#line 2434 "autosave-manager.c"
 	} else {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2473 "autosave-manager.c"
+#line 2438 "autosave-manager.c"
 	}
 }
 
@@ -2478,37 +2443,37 @@ static void value_autosave_manager_copy_value (const GValue* src_value, GValue*
 static gpointer value_autosave_manager_peek_pointer (const GValue* value) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return value->data[0].v_pointer;
-#line 2481 "autosave-manager.c"
+#line 2446 "autosave-manager.c"
 }
 
 
 static gchar* value_autosave_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (collect_values[0].v_pointer) {
-#line 2488 "autosave-manager.c"
+#line 2453 "autosave-manager.c"
 		AutosaveManager* object;
 		object = collect_values[0].v_pointer;
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2495 "autosave-manager.c"
+#line 2460 "autosave-manager.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2499 "autosave-manager.c"
+#line 2464 "autosave-manager.c"
 		}
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = autosave_manager_ref (object);
-#line 2503 "autosave-manager.c"
+#line 2468 "autosave-manager.c"
 	} else {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = NULL;
-#line 2507 "autosave-manager.c"
+#line 2472 "autosave-manager.c"
 	}
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return NULL;
-#line 2511 "autosave-manager.c"
+#line 2476 "autosave-manager.c"
 }
 
 
@@ -2519,25 +2484,25 @@ static gchar* value_autosave_manager_lcopy_value (const GValue* value, guint n_c
 	if (!object_p) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2522 "autosave-manager.c"
+#line 2487 "autosave-manager.c"
 	}
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (!value->data[0].v_pointer) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		*object_p = NULL;
-#line 2528 "autosave-manager.c"
+#line 2493 "autosave-manager.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2532 "autosave-manager.c"
+#line 2497 "autosave-manager.c"
 	} else {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		*object_p = autosave_manager_ref (value->data[0].v_pointer);
-#line 2536 "autosave-manager.c"
+#line 2501 "autosave-manager.c"
 	}
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return NULL;
-#line 2540 "autosave-manager.c"
+#line 2505 "autosave-manager.c"
 }
 
 
@@ -2551,7 +2516,7 @@ GParamSpec* param_spec_autosave_manager (const gchar* name, const gchar* nick, c
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return G_PARAM_SPEC (spec);
-#line 2554 "autosave-manager.c"
+#line 2519 "autosave-manager.c"
 }
 
 
@@ -2560,7 +2525,7 @@ gpointer value_get_autosave_manager (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AUTOSAVE_MANAGER), NULL);
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return value->data[0].v_pointer;
-#line 2563 "autosave-manager.c"
+#line 2528 "autosave-manager.c"
 }
 
 
@@ -2580,17 +2545,17 @@ void value_set_autosave_manager (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_ref (value->data[0].v_pointer);
-#line 2583 "autosave-manager.c"
+#line 2548 "autosave-manager.c"
 	} else {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = NULL;
-#line 2587 "autosave-manager.c"
+#line 2552 "autosave-manager.c"
 	}
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (old) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_unref (old);
-#line 2593 "autosave-manager.c"
+#line 2558 "autosave-manager.c"
 	}
 }
 
@@ -2609,17 +2574,17 @@ void value_take_autosave_manager (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = v_object;
-#line 2612 "autosave-manager.c"
+#line 2577 "autosave-manager.c"
 	} else {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = NULL;
-#line 2616 "autosave-manager.c"
+#line 2581 "autosave-manager.c"
 	}
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (old) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_unref (old);
-#line 2622 "autosave-manager.c"
+#line 2587 "autosave-manager.c"
 	}
 }
 
@@ -2655,7 +2620,7 @@ static void autosave_manager_class_init (AutosaveManagerClass * klass) {
 	_tmp5_ = g_build_filename (_tmp3_, _tmp4_, NULL);
 #line 17 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_AUTOSAVE_PATH = _tmp5_;
-#line 2658 "autosave-manager.c"
+#line 2623 "autosave-manager.c"
 }
 
 
@@ -2668,7 +2633,7 @@ static void autosave_manager_instance_init (AutosaveManager * self) {
 	self->priv->book_ = NULL;
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->ref_count = 1;
-#line 2671 "autosave-manager.c"
+#line 2636 "autosave-manager.c"
 }
 
 
@@ -2680,7 +2645,7 @@ static void autosave_manager_finalize (AutosaveManager* obj) {
 	_g_hash_table_unref0 (self->priv->page_filenames);
 #line 23 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_book_unref0 (self->priv->book_);
-#line 2683 "autosave-manager.c"
+#line 2648 "autosave-manager.c"
 }
 
 
@@ -2705,7 +2670,7 @@ gpointer autosave_manager_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return instance;
-#line 2708 "autosave-manager.c"
+#line 2673 "autosave-manager.c"
 }
 
 
@@ -2718,7 +2683,7 @@ void autosave_manager_unref (gpointer instance) {
 		AUTOSAVE_MANAGER_GET_CLASS (self)->finalize (self);
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2721 "autosave-manager.c"
+#line 2686 "autosave-manager.c"
 	}
 }